From a543436b960cc97ec1dfdb1ac5efe5da6e99fbe0 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 28 Jun 2017 08:57:57 -0700
Subject: [PATCH] SimpleExoPlayerView/DefaultTimebar fixes

- Restore making the playback controls visible on any key press.
- Turn anti-aliasing on for drawing the scrubber circle. It looks
  really ugly on some devices if you don't do this.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=160413777
---
 .../com/google/android/exoplayer2/demo/PlayerActivity.java | 4 ++--
 .../com/google/android/exoplayer2/ui/DefaultTimeBar.java   | 5 +++--
 .../google/android/exoplayer2/ui/SimpleExoPlayerView.java  | 7 ++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
index 0659041c8b..b3e9191672 100644
--- a/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
+++ b/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -205,8 +205,8 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
 
   @Override
   public boolean dispatchKeyEvent(KeyEvent event) {
-    // If the event was not handled then see if the player view can handle it as a media key event.
-    return super.dispatchKeyEvent(event) || simpleExoPlayerView.dispatchMediaKeyEvent(event);
+    // If the event was not handled then see if the player view can handle it.
+    return super.dispatchKeyEvent(event) || simpleExoPlayerView.dispatchKeyEvent(event);
   }
 
   // OnClickListener methods
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 3683196a31..cd9b13e4f6 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
@@ -73,10 +73,10 @@ public class DefaultTimeBar extends View implements TimeBar {
   private final Rect bufferedBar;
   private final Rect scrubberBar;
   private final Paint playedPaint;
-  private final Paint scrubberPaint;
   private final Paint bufferedPaint;
   private final Paint unplayedPaint;
   private final Paint adMarkerPaint;
+  private final Paint scrubberPaint;
   private final int barHeight;
   private final int touchTargetHeight;
   private final int adMarkerWidth;
@@ -115,10 +115,11 @@ public class DefaultTimeBar extends View implements TimeBar {
     bufferedBar = new Rect();
     scrubberBar = new Rect();
     playedPaint = new Paint();
-    scrubberPaint = new Paint();
     bufferedPaint = new Paint();
     unplayedPaint = new Paint();
     adMarkerPaint = new Paint();
+    scrubberPaint = new Paint();
+    scrubberPaint.setAntiAlias(true);
 
     // Calculate the dimensions and paints for drawn elements.
     Resources res = context.getResources();
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
index 3ec9b0943a..fcbb834c18 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
@@ -495,6 +495,7 @@ public final class SimpleExoPlayerView extends FrameLayout {
 
   @Override
   public boolean dispatchKeyEvent(KeyEvent event) {
+    maybeShowController(true);
     return dispatchMediaKeyEvent(event) || super.dispatchKeyEvent(event);
   }
 
@@ -506,11 +507,7 @@ public final class SimpleExoPlayerView extends FrameLayout {
    * @return Whether the key event was handled.
    */
   public boolean dispatchMediaKeyEvent(KeyEvent event) {
-    boolean handled = useController && controller.dispatchMediaKeyEvent(event);
-    if (handled) {
-      maybeShowController(true);
-    }
-    return handled;
+    return useController && controller.dispatchMediaKeyEvent(event);
   }
 
   /**