From 4c0b53905402e9c9b9826033b8f58e531c38225d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 24 Apr 2017 04:35:25 -0700
Subject: [PATCH] Allow disabling hide on touch for SimpleExoPlayerView

Issue: #2501

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=154036726
---
 .../exoplayer2/ui/SimpleExoPlayerView.java    | 44 +++++++++++++++----
 library/ui/src/main/res/values/attrs.xml      |  3 +-
 2 files changed, 38 insertions(+), 9 deletions(-)

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 bdb7539563..bb47226c42 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
@@ -74,12 +74,18 @@ import java.util.List;
  *         <li>Default: {@code null}</li>
  *       </ul>
  *   </li>
- *   <li><b>{@code use_controller}</b> - Whether playback controls are displayed.
+ *   <li><b>{@code use_controller}</b> - Whether the playback controls can be shown.
  *       <ul>
  *         <li>Corresponding method: {@link #setUseController(boolean)}</li>
  *         <li>Default: {@code true}</li>
  *       </ul>
  *   </li>
+ *   <li><b>{@code hide_on_touch}</b> - Whether the playback controls are hidden by touch events.
+ *       <ul>
+ *         <li>Corresponding method: {@link #setControllerHideOnTouch(boolean)}</li>
+ *         <li>Default: {@code true}</li>
+ *       </ul>
+ *   </li>
  *   <li><b>{@code resize_mode}</b> - Controls how video and album art is resized within the view.
  *       Valid values are {@code fit}, {@code fixed_width}, {@code fixed_height} and {@code fill}.
  *       <ul>
@@ -190,6 +196,7 @@ public final class SimpleExoPlayerView extends FrameLayout {
   private boolean useArtwork;
   private Bitmap defaultArtwork;
   private int controllerShowTimeoutMs;
+  private boolean controllerHideOnTouch;
 
   public SimpleExoPlayerView(Context context) {
     this(context, null);
@@ -228,6 +235,7 @@ public final class SimpleExoPlayerView extends FrameLayout {
     int surfaceType = SURFACE_TYPE_SURFACE_VIEW;
     int resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT;
     int controllerShowTimeoutMs = PlaybackControlView.DEFAULT_SHOW_TIMEOUT_MS;
+    boolean controllerHideOnTouch = true;
     if (attrs != null) {
       TypedArray a = context.getTheme().obtainStyledAttributes(attrs,
           R.styleable.SimpleExoPlayerView, 0, 0);
@@ -242,6 +250,8 @@ public final class SimpleExoPlayerView extends FrameLayout {
         resizeMode = a.getInt(R.styleable.SimpleExoPlayerView_resize_mode, resizeMode);
         controllerShowTimeoutMs = a.getInt(R.styleable.SimpleExoPlayerView_show_timeout,
             controllerShowTimeoutMs);
+        controllerHideOnTouch = a.getBoolean(R.styleable.SimpleExoPlayerView_hide_on_touch,
+            controllerHideOnTouch);
       } finally {
         a.recycle();
       }
@@ -304,6 +314,7 @@ public final class SimpleExoPlayerView extends FrameLayout {
       this.controller = null;
     }
     this.controllerShowTimeoutMs = controller != null ? controllerShowTimeoutMs : 0;
+    this.controllerHideOnTouch = controllerHideOnTouch;
     this.useController = useController && controller != null;
     hideController();
   }
@@ -407,17 +418,17 @@ public final class SimpleExoPlayerView extends FrameLayout {
   }
 
   /**
-   * Returns whether the playback controls are enabled.
+   * Returns whether the playback controls can be shown.
    */
   public boolean getUseController() {
     return useController;
   }
 
   /**
-   * Sets whether playback controls are enabled. If set to {@code false} the playback controls are
-   * never visible and are disconnected from the player.
+   * Sets whether the playback controls can be shown. If set to {@code false} the playback controls
+   * are never visible and are disconnected from the player.
    *
-   * @param useController Whether playback controls should be enabled.
+   * @param useController Whether the playback controls can be shown.
    */
   public void setUseController(boolean useController) {
     Assertions.checkState(!useController || controller != null);
@@ -486,6 +497,23 @@ public final class SimpleExoPlayerView extends FrameLayout {
     this.controllerShowTimeoutMs = controllerShowTimeoutMs;
   }
 
+  /**
+   * Returns whether the playback controls are hidden by touch events.
+   */
+  public boolean getControllerHideOnTouch() {
+    return controllerHideOnTouch;
+  }
+
+  /**
+   * Sets whether the playback controls are hidden by touch events.
+   *
+   * @param controllerHideOnTouch Whether the playback controls are hidden by touch events.
+   */
+  public void setControllerHideOnTouch(boolean controllerHideOnTouch) {
+    Assertions.checkState(controller != null);
+    this.controllerHideOnTouch = controllerHideOnTouch;
+  }
+
   /**
    * Set the {@link PlaybackControlView.VisibilityListener}.
    *
@@ -573,10 +601,10 @@ public final class SimpleExoPlayerView extends FrameLayout {
     if (!useController || player == null || ev.getActionMasked() != MotionEvent.ACTION_DOWN) {
       return false;
     }
-    if (controller.isVisible()) {
-      controller.hide();
-    } else {
+    if (!controller.isVisible()) {
       maybeShowController(true);
+    } else if (controllerHideOnTouch) {
+      controller.hide();
     }
     return true;
   }
diff --git a/library/ui/src/main/res/values/attrs.xml b/library/ui/src/main/res/values/attrs.xml
index 46c7eb1a0c..521e535ce3 100644
--- a/library/ui/src/main/res/values/attrs.xml
+++ b/library/ui/src/main/res/values/attrs.xml
@@ -39,11 +39,12 @@
     <attr name="use_artwork" format="boolean"/>
     <attr name="default_artwork" format="reference"/>
     <attr name="use_controller" format="boolean"/>
+    <attr name="hide_on_touch" format="boolean"/>
+    <attr name="resize_mode"/>
     <attr name="surface_type"/>
     <attr name="show_timeout"/>
     <attr name="rewind_increment"/>
     <attr name="fastforward_increment"/>
-    <attr name="resize_mode"/>
     <attr name="player_layout_id"/>
     <attr name="controller_layout_id"/>
   </declare-styleable>