From 088938c9abed346c18533a472721ef150f78edb7 Mon Sep 17 00:00:00 2001
From: Artem Chepurnoy <artemchep@gmail.com>
Date: Wed, 29 Apr 2020 14:55:59 +0300
Subject: [PATCH 1/2] Fix DefaultTimeBar ignores touch transformations #7303

---
 .../com/google/android/exoplayer2/ui/DefaultTimeBar.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
index b7e96d2484..3d07acf1a9 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
@@ -798,10 +798,9 @@ public class DefaultTimeBar extends View implements TimeBar {
   }
 
   private Point resolveRelativeTouchPosition(MotionEvent motionEvent) {
-    getLocationOnScreen(locationOnScreen);
     touchPosition.set(
-        ((int) motionEvent.getRawX()) - locationOnScreen[0],
-        ((int) motionEvent.getRawY()) - locationOnScreen[1]);
+        (int) motionEvent.getX(),
+        (int) motionEvent.getY());
     return touchPosition;
   }
 

From dfde3df2c26285a51901739393f811a34bc150d8 Mon Sep 17 00:00:00 2001
From: Artem Chepurnoy <ArtemChep@gmail.com>
Date: Thu, 30 Apr 2020 17:36:04 +0300
Subject: [PATCH 2/2] Remove unused `locationOnScreen` variable

---
 .../java/com/google/android/exoplayer2/ui/DefaultTimeBar.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
index 3d07acf1a9..f14e51ca42 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
@@ -196,7 +196,6 @@ public class DefaultTimeBar extends View implements TimeBar {
   private final Formatter formatter;
   private final Runnable stopScrubbingRunnable;
   private final CopyOnWriteArraySet<OnScrubListener> listeners;
-  private final int[] locationOnScreen;
   private final Point touchPosition;
   private final float density;
 
@@ -248,7 +247,6 @@ public class DefaultTimeBar extends View implements TimeBar {
     scrubberPaint = new Paint();
     scrubberPaint.setAntiAlias(true);
     listeners = new CopyOnWriteArraySet<>();
-    locationOnScreen = new int[2];
     touchPosition = new Point();
 
     // Calculate the dimensions and paints for drawn elements.