From a779eabdc5d4c8aa362479bf7085c1dd579e8a48 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 1 Sep 2016 03:27:04 -0700
Subject: [PATCH] Update SDK / Tools.

- Centralise compileSdkVersion, targetSdkVersion and
  buildToolsVersion in a single place for gradle.
- Bump compileSdkVersion and targetSdkVersion to 24.
- Bump com.android.tools.build version to re-enable
  instant start.
- Bump targetSdkVersion in manifests (needed for
  internal builds).
- Use standard expandable_list_item from Android in
  the demo app, since ours doesn't look right when
  targeting API level 24. We were also setting the
  theme on the wrong element in the manifest, so I'm
  removing that line.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=131929216
---
 demo/build.gradle                             |  7 +++--
 demo/src/main/AndroidManifest.xml             |  5 ++--
 .../demo/SampleChooserActivity.java           |  4 +--
 demo/src/main/res/layout/player_activity.xml  |  3 +-
 .../layout/sample_chooser_inline_header.xml   | 29 -------------------
 demo/src/main/res/values/styles.xml           | 11 +------
 extensions/cronet/build.gradle                |  6 ++--
 .../src/androidTest/AndroidManifest.xml       |  2 +-
 .../cronet/src/main/AndroidManifest.xml       |  2 --
 extensions/ffmpeg/build.gradle                |  6 ++--
 extensions/flac/build.gradle                  |  6 ++--
 .../flac/src/androidTest/AndroidManifest.xml  |  2 +-
 extensions/okhttp/build.gradle                |  6 ++--
 extensions/opus/build.gradle                  |  6 ++--
 .../opus/src/androidTest/AndroidManifest.xml  |  2 +-
 extensions/vp9/build.gradle                   |  6 ++--
 .../vp9/src/androidTest/AndroidManifest.xml   |  2 +-
 library/build.gradle                          |  6 ++--
 library/src/androidTest/AndroidManifest.xml   |  2 +-
 playbacktests/build.gradle                    |  7 +++--
 playbacktests/src/main/AndroidManifest.xml    |  2 +-
 testutils/build.gradle                        |  9 +++---
 22 files changed, 45 insertions(+), 86 deletions(-)
 delete mode 100644 demo/src/main/res/layout/sample_chooser_inline_header.xml

diff --git a/demo/build.gradle b/demo/build.gradle
index 89a6b3619b..6aaedf05c5 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -14,13 +14,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
+
     buildTypes {
         release {
             minifyEnabled false
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index 0f42369721..6cf98d2aca 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -17,13 +17,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.demo"
     android:versionCode="2000"
-    android:versionName="2.0.0"
-    android:theme="@style/RootTheme">
+    android:versionName="2.0.0">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24"/>
 
   <application
       android:label="@string/application_name"
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
index ca4234d7b0..43dfdaf912 100644
--- a/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
+++ b/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
@@ -303,8 +303,8 @@ public class SampleChooserActivity extends Activity {
         ViewGroup parent) {
       View view = convertView;
       if (view == null) {
-        view = LayoutInflater.from(context).inflate(R.layout.sample_chooser_inline_header, parent,
-            false);
+        view = LayoutInflater.from(context).inflate(android.R.layout.simple_expandable_list_item_1,
+            parent, false);
       }
       ((TextView) view).setText(getGroup(groupPosition).title);
       return view;
diff --git a/demo/src/main/res/layout/player_activity.xml b/demo/src/main/res/layout/player_activity.xml
index 8d0d6f66a9..80e05b5dfd 100644
--- a/demo/src/main/res/layout/player_activity.xml
+++ b/demo/src/main/res/layout/player_activity.xml
@@ -68,8 +68,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:text="@string/retry"
-          android:visibility="gone"
-          style="@style/DemoButton"/>
+          android:visibility="gone"/>
 
     </LinearLayout>
 
diff --git a/demo/src/main/res/layout/sample_chooser_inline_header.xml b/demo/src/main/res/layout/sample_chooser_inline_header.xml
deleted file mode 100644
index 8766d82fda..0000000000
--- a/demo/src/main/res/layout/sample_chooser_inline_header.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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.
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textStyle="bold"
-    android:textAllCaps="true"
-    android:textColor="@android:color/white"
-    android:textSize="14sp"
-    android:paddingStart="?android:attr/expandableListPreferredItemPaddingLeft"
-    android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft"
-    android:paddingRight="8dp"
-    android:paddingEnd="8dp"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
-    android:background="#339999FF"/>
diff --git a/demo/src/main/res/values/styles.xml b/demo/src/main/res/values/styles.xml
index 0817a76870..751a224210 100644
--- a/demo/src/main/res/values/styles.xml
+++ b/demo/src/main/res/values/styles.xml
@@ -16,18 +16,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <style name="RootTheme" parent="android:Theme.Holo">
-  </style>
-
-  <style name="PlayerTheme" parent="@style/RootTheme">
+  <style name="PlayerTheme" parent="android:Theme.Holo">
     <item name="android:windowNoTitle">true</item>
     <item name="android:windowBackground">@android:color/black</item>
   </style>
 
-  <style name="DemoButton">
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:minWidth">40dp</item>
-  </style>
-
 </resources>
diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
index 0b75639d73..ae2914dba3 100644
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/extensions/cronet/src/androidTest/AndroidManifest.xml b/extensions/cronet/src/androidTest/AndroidManifest.xml
index 48edf5aca6..2f45a1a2e5 100644
--- a/extensions/cronet/src/androidTest/AndroidManifest.xml
+++ b/extensions/cronet/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer.ext.cronet">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/extensions/cronet/src/main/AndroidManifest.xml b/extensions/cronet/src/main/AndroidManifest.xml
index 4de726be98..c81d95f104 100644
--- a/extensions/cronet/src/main/AndroidManifest.xml
+++ b/extensions/cronet/src/main/AndroidManifest.xml
@@ -18,6 +18,4 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
-
 </manifest>
diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle
index 2c8850bb37..579c663fe2 100644
--- a/extensions/ffmpeg/build.gradle
+++ b/extensions/ffmpeg/build.gradle
@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.1'
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
 
     buildTypes {
diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle
index 1a24c9ab56..a40a1adead 100644
--- a/extensions/flac/build.gradle
+++ b/extensions/flac/build.gradle
@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
 
     buildTypes {
diff --git a/extensions/flac/src/androidTest/AndroidManifest.xml b/extensions/flac/src/androidTest/AndroidManifest.xml
index 536f3d2f81..0a62db3bb5 100644
--- a/extensions/flac/src/androidTest/AndroidManifest.xml
+++ b/extensions/flac/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.flac.test">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index 4e5ef1af8f..baadb6a50b 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
 
     buildTypes {
diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle
index e170263d74..3bc06ddaf4 100644
--- a/extensions/opus/build.gradle
+++ b/extensions/opus/build.gradle
@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
 
     buildTypes {
diff --git a/extensions/opus/src/androidTest/AndroidManifest.xml b/extensions/opus/src/androidTest/AndroidManifest.xml
index f4168ba3ec..c819529692 100644
--- a/extensions/opus/src/androidTest/AndroidManifest.xml
+++ b/extensions/opus/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.opus.test">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle
index e170263d74..3bc06ddaf4 100644
--- a/extensions/vp9/build.gradle
+++ b/extensions/vp9/build.gradle
@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
 
     buildTypes {
diff --git a/extensions/vp9/src/androidTest/AndroidManifest.xml b/extensions/vp9/src/androidTest/AndroidManifest.xml
index 9529023996..d9fa8af2c3 100644
--- a/extensions/vp9/src/androidTest/AndroidManifest.xml
+++ b/extensions/vp9/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.vp9.test">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/library/build.gradle b/library/build.gradle
index b9ad6e2061..d301e0903e 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'bintray-release'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
         // Important: ExoPlayerLib specifies a minSdkVersion of 9 because
@@ -27,7 +27,7 @@ android {
         // functionality provided by the library requires API level 16 or
         // greater.
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
 
     buildTypes {
diff --git a/library/src/androidTest/AndroidManifest.xml b/library/src/androidTest/AndroidManifest.xml
index 98f2f6acfe..d8c7a2ce9f 100644
--- a/library/src/androidTest/AndroidManifest.xml
+++ b/library/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.test">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle
index 5487dc9928..f6d59e758c 100644
--- a/playbacktests/build.gradle
+++ b/playbacktests/build.gradle
@@ -14,13 +14,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
+
     buildTypes {
         release {
             minifyEnabled false
diff --git a/playbacktests/src/main/AndroidManifest.xml b/playbacktests/src/main/AndroidManifest.xml
index 1b2f6e9962..38e8491b31 100644
--- a/playbacktests/src/main/AndroidManifest.xml
+++ b/playbacktests/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/testutils/build.gradle b/testutils/build.gradle
index b9c851d51f..61bb50f74d 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -1,15 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion project.ext.targetSdkVersion
     }
+
     buildTypes {
         release {
             minifyEnabled false