From 8bc7da5681386c52ce1415420b37719809ee8849 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 30 Nov 2016 12:20:38 -0800
Subject: [PATCH] Finish fixing playback control focus

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=140635851
---
 library/src/main/res/values-v11/styles.xml | 24 ++++++++++++++++++++++
 library/src/main/res/values/attrs.xml      |  2 ++
 library/src/main/res/values/constants.xml  | 21 +++++++++++++++++++
 library/src/main/res/values/ids.xml        |  2 ++
 library/src/main/res/values/styles.xml     |  4 ++--
 5 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 library/src/main/res/values-v11/styles.xml
 create mode 100644 library/src/main/res/values/constants.xml

diff --git a/library/src/main/res/values-v11/styles.xml b/library/src/main/res/values-v11/styles.xml
new file mode 100644
index 0000000000..6f77440287
--- /dev/null
+++ b/library/src/main/res/values-v11/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+
+  <style name="ExoMediaButton">
+    <item name="android:background">?android:attr/selectableItemBackground</item>
+    <item name="android:layout_width">@dimen/exo_media_button_width</item>
+    <item name="android:layout_height">@dimen/exo_media_button_height</item>
+  </style>
+
+</resources>
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
index c3fc16495c..b5c01b4575 100644
--- a/library/src/main/res/values/attrs.xml
+++ b/library/src/main/res/values/attrs.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <resources>
+
   <!-- Must be kept in sync with AspectRatioFrameLayout -->
   <attr name="resize_mode" format="enum">
     <enum name="fit" value="0"/>
@@ -21,6 +22,7 @@
     <enum name="fixed_height" value="2"/>
     <enum name="fill" value="3"/>
   </attr>
+
   <!-- Must be kept in sync with SimpleExoPlayerView -->
   <attr name="surface_type" format="enum">
     <enum name="none" value="0"/>
diff --git a/library/src/main/res/values/constants.xml b/library/src/main/res/values/constants.xml
new file mode 100644
index 0000000000..5c86696ea0
--- /dev/null
+++ b/library/src/main/res/values/constants.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+
+  <dimen name="exo_media_button_width">71dp</dimen>
+  <dimen name="exo_media_button_height">52dp</dimen>
+
+</resources>
diff --git a/library/src/main/res/values/ids.xml b/library/src/main/res/values/ids.xml
index f55c8f6945..61db83825e 100644
--- a/library/src/main/res/values/ids.xml
+++ b/library/src/main/res/values/ids.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <resources>
+
   <item name="exo_content_frame" type="id"/>
   <item name="exo_shutter" type="id"/>
   <item name="exo_subtitles" type="id"/>
@@ -29,4 +30,5 @@
   <item name="exo_duration" type="id"/>
   <item name="exo_position" type="id"/>
   <item name="exo_progress" type="id"/>
+
 </resources>
diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
index a08bf902fa..a67cffe420 100644
--- a/library/src/main/res/values/styles.xml
+++ b/library/src/main/res/values/styles.xml
@@ -17,8 +17,8 @@
 
   <style name="ExoMediaButton">
     <item name="android:background">@null</item>
-    <item name="android:layout_width">71dp</item>
-    <item name="android:layout_height">52dp</item>
+    <item name="android:layout_width">@dimen/exo_media_button_width</item>
+    <item name="android:layout_height">@dimen/exo_media_button_height</item>
   </style>
 
   <style name="ExoMediaButton.Previous">