From e92667ba5b58cbda9695c8168d3f8fa810da8288 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 13 Nov 2017 17:28:25 +0000
Subject: [PATCH] Only set shutter color if attr is declared

---
 .../exoplayer2/ui/SimpleExoPlayerView.java    | 22 +++++++++++--------
 library/ui/src/main/res/values/attrs.xml      |  2 +-
 2 files changed, 14 insertions(+), 10 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 86fe7a3f7f..b09e80c591 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
@@ -83,12 +83,6 @@ import java.util.List;
  *         <li>Default: {@code true}</li>
  *       </ul>
  *   </li>
- *   <li><b>{@code shutter_background_color}</b> - The background color of the {@code exo_shutter} view.
- *       <ul>
- *         <li>Corresponding method: {@link #setShutterBackgroundColor(int)}</li>
- *         <li>Default: {@code 0}</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>
@@ -119,6 +113,13 @@ import java.util.List;
  *         <li>Default: {@code surface_view}</li>
  *       </ul>
  *   </li>
+ *   <li><b>{@code shutter_background_color}</b> - The background color of the {@code exo_shutter}
+ *       view.
+ *       <ul>
+ *         <li>Corresponding method: {@link #setShutterBackgroundColor(int)}</li>
+ *         <li>Default: {@code unset}</li>
+ *       </ul>
+ *   </li>
  *   <li><b>{@code player_layout_id}</b> - Specifies the id of the layout to be inflated. See below
  *       for more details.
  *       <ul>
@@ -255,6 +256,7 @@ public final class SimpleExoPlayerView extends FrameLayout {
       return;
     }
 
+    boolean shutterColorSet = false;
     int shutterColor = 0;
     int playerLayoutId = R.layout.exo_simple_player_view;
     boolean useArtwork = true;
@@ -269,7 +271,9 @@ public final class SimpleExoPlayerView extends FrameLayout {
       TypedArray a = context.getTheme().obtainStyledAttributes(attrs,
           R.styleable.SimpleExoPlayerView, 0, 0);
       try {
-        shutterColor = a.getColor(R.styleable.SimpleExoPlayerView_shutter_background_color, shutterColor);
+        shutterColorSet = a.hasValue(R.styleable.SimpleExoPlayerView_shutter_background_color);
+        shutterColor = a.getColor(R.styleable.SimpleExoPlayerView_shutter_background_color,
+              shutterColor);
         playerLayoutId = a.getResourceId(R.styleable.SimpleExoPlayerView_player_layout_id,
             playerLayoutId);
         useArtwork = a.getBoolean(R.styleable.SimpleExoPlayerView_use_artwork, useArtwork);
@@ -301,7 +305,7 @@ public final class SimpleExoPlayerView extends FrameLayout {
 
     // Shutter view.
     shutterView = findViewById(R.id.exo_shutter);
-    if (shutterView != null) {
+    if (shutterView != null && shutterColorSet) {
       shutterView.setBackgroundColor(shutterColor);
     }
 
@@ -527,7 +531,7 @@ public final class SimpleExoPlayerView extends FrameLayout {
   /**
    * Sets the background color of the {@code exo_shutter} view.
    *
-   * @param color A resolved color (not a resource ID) for the background of the shutter view.
+   * @param color The background color.
    */
   public void setShutterBackgroundColor(int color) {
     if (shutterView != null) {
diff --git a/library/ui/src/main/res/values/attrs.xml b/library/ui/src/main/res/values/attrs.xml
index eb9edaccdc..525f95768c 100644
--- a/library/ui/src/main/res/values/attrs.xml
+++ b/library/ui/src/main/res/values/attrs.xml
@@ -43,7 +43,7 @@
 
   <declare-styleable name="SimpleExoPlayerView">
     <attr name="use_artwork" format="boolean"/>
-    <attr name="shutter_background_color" format="color" />
+    <attr name="shutter_background_color" format="color"/>
     <attr name="default_artwork" format="reference"/>
     <attr name="use_controller" format="boolean"/>
     <attr name="hide_on_touch" format="boolean"/>