Set targetSdkVersion in all Support*Demos apps
Test: ./gradlew assembleDebug
Change-Id: Ib1bc519c4970b20ffb064ec147bcd6d20bd721e1
diff --git a/samples/Support13Demos/AndroidManifest.xml b/samples/Support13Demos/AndroidManifest.xml
index cdc246f..af7fad2 100644
--- a/samples/Support13Demos/AndroidManifest.xml
+++ b/samples/Support13Demos/AndroidManifest.xml
@@ -24,8 +24,6 @@
<uses-permission android:name="android.permission.READ_CONTACTS" />
- <uses-sdk android:minSdkVersion="14" />
-
<!-- The smallest screen this app works on is a phone. The app will
scale its UI to larger screens but doesn't make good use of them
so allow the compatibility mode button to be shown (mostly because
diff --git a/samples/Support13Demos/build.gradle b/samples/Support13Demos/build.gradle
index d1d4471..c63312f 100644
--- a/samples/Support13Demos/build.gradle
+++ b/samples/Support13Demos/build.gradle
@@ -9,6 +9,7 @@
defaultConfig {
minSdkVersion 14
+ targetSdkVersion project.ext.currentSdk
}
sourceSets {
diff --git a/samples/Support4Demos/AndroidManifest.xml b/samples/Support4Demos/AndroidManifest.xml
index 893259c..812d4e8 100644
--- a/samples/Support4Demos/AndroidManifest.xml
+++ b/samples/Support4Demos/AndroidManifest.xml
@@ -26,8 +26,6 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
- <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="22" />
-
<!-- The smallest screen this app works on is a phone. The app will
scale its UI to larger screens but doesn't make good use of them
so allow the compatibility mode button to be shown (mostly because
@@ -51,7 +49,7 @@
<activity android:name=".app.SendResult"
android:theme="@style/ThemeDialogWhenLarge">
</activity>
-
+
<!-- Fragment Support Samples -->
<activity android:name=".app.FragmentAlertDialogSupport"
@@ -144,7 +142,7 @@
<category android:name="com.example.android.supportv4.SUPPORT4_SAMPLE_CODE" />
</intent-filter>
</activity>
-
+
<activity android:name=".app.FragmentRetainInstanceSupport"
android:label="@string/fragment_retain_instance_support">
<intent-filter>
@@ -216,7 +214,7 @@
<category android:name="com.example.android.supportv4.SUPPORT4_SAMPLE_CODE" />
</intent-filter>
</activity>
-
+
<activity android:name=".app.LoaderCustomSupport"
android:label="@string/loader_custom_support">
<intent-filter>
diff --git a/samples/Support4Demos/build.gradle b/samples/Support4Demos/build.gradle
index 353b17f..836b212 100644
--- a/samples/Support4Demos/build.gradle
+++ b/samples/Support4Demos/build.gradle
@@ -9,6 +9,7 @@
defaultConfig {
minSdkVersion 14
+ targetSdkVersion project.ext.currentSdk
}
sourceSets {
diff --git a/samples/Support7Demos/AndroidManifest.xml b/samples/Support7Demos/AndroidManifest.xml
index 25b2427..1604267 100644
--- a/samples/Support7Demos/AndroidManifest.xml
+++ b/samples/Support7Demos/AndroidManifest.xml
@@ -34,8 +34,6 @@
<!-- Permission for ACCESS_COARSE_LOCATION is required for DayNight themes. -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
- <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="21" />
-
<!-- The smallest screen this app works on is a phone. The app will
scale its UI to larger screens but doesn't make good use of them
so allow the compatibility mode button to be shown (mostly because
diff --git a/samples/Support7Demos/build.gradle b/samples/Support7Demos/build.gradle
index 0da74be..618cfab 100644
--- a/samples/Support7Demos/build.gradle
+++ b/samples/Support7Demos/build.gradle
@@ -14,6 +14,7 @@
defaultConfig {
minSdkVersion 14
+ targetSdkVersion project.ext.currentSdk
vectorDrawables.useSupportLibrary = true
}
diff --git a/samples/SupportAnimationDemos/AndroidManifest.xml b/samples/SupportAnimationDemos/AndroidManifest.xml
index 25e5ec8..243e6e4 100644
--- a/samples/SupportAnimationDemos/AndroidManifest.xml
+++ b/samples/SupportAnimationDemos/AndroidManifest.xml
@@ -16,9 +16,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.support.animation">
-
- <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="25" />
-
<application android:label="@string/activity_sample_code"
android:supportsRtl="true"
android:icon="@drawable/app_sample_code"
diff --git a/samples/SupportAnimationDemos/build.gradle b/samples/SupportAnimationDemos/build.gradle
index 6f3daf9..c619f6b 100644
--- a/samples/SupportAnimationDemos/build.gradle
+++ b/samples/SupportAnimationDemos/build.gradle
@@ -9,6 +9,7 @@
defaultConfig {
minSdkVersion 16
+ targetSdkVersion project.ext.currentSdk
}
sourceSets {
diff --git a/samples/SupportAppNavigation/AndroidManifest.xml b/samples/SupportAppNavigation/AndroidManifest.xml
index c8e4fa8..4681b33 100644
--- a/samples/SupportAppNavigation/AndroidManifest.xml
+++ b/samples/SupportAppNavigation/AndroidManifest.xml
@@ -18,9 +18,6 @@
android:versionName="1"
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.support.appnavigation">
-
- <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15" />
-
<application android:label="@string/app_name">
<activity android:name=".app.AppNavHomeActivity"
android:label="@string/app_nav_home_label">
diff --git a/samples/SupportAppNavigation/build.gradle b/samples/SupportAppNavigation/build.gradle
index 456d677..bb48f2f 100644
--- a/samples/SupportAppNavigation/build.gradle
+++ b/samples/SupportAppNavigation/build.gradle
@@ -25,6 +25,7 @@
defaultConfig {
minSdkVersion 14
+ targetSdkVersion project.ext.currentSdk
}
sourceSets {
diff --git a/samples/SupportDesignDemos/AndroidManifest.xml b/samples/SupportDesignDemos/AndroidManifest.xml
index 88c423a..bedbea9 100644
--- a/samples/SupportDesignDemos/AndroidManifest.xml
+++ b/samples/SupportDesignDemos/AndroidManifest.xml
@@ -22,8 +22,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.support.design">
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
-
<application android:label="@string/activity_sample_code"
android:supportsRtl="true"
android:icon="@drawable/app_sample_code"
diff --git a/samples/SupportDesignDemos/build.gradle b/samples/SupportDesignDemos/build.gradle
index ac0b714..7987f52 100644
--- a/samples/SupportDesignDemos/build.gradle
+++ b/samples/SupportDesignDemos/build.gradle
@@ -9,6 +9,7 @@
defaultConfig {
minSdkVersion 14
+ targetSdkVersion project.ext.currentSdk
vectorDrawables.useSupportLibrary = true
}
diff --git a/samples/SupportEmojiDemos/build.gradle b/samples/SupportEmojiDemos/build.gradle
index 3c32d48..230e478 100644
--- a/samples/SupportEmojiDemos/build.gradle
+++ b/samples/SupportEmojiDemos/build.gradle
@@ -31,6 +31,7 @@
defaultConfig {
minSdkVersion 14
+ targetSdkVersion project.ext.currentSdk
}
sourceSets {
diff --git a/samples/SupportLeanbackDemos/AndroidManifest.xml b/samples/SupportLeanbackDemos/AndroidManifest.xml
index 067bb36..93bddce 100644
--- a/samples/SupportLeanbackDemos/AndroidManifest.xml
+++ b/samples/SupportLeanbackDemos/AndroidManifest.xml
@@ -4,7 +4,6 @@
android:versionCode="1"
android:versionName="1.0">
- <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
diff --git a/samples/SupportLeanbackDemos/build.gradle b/samples/SupportLeanbackDemos/build.gradle
index 122d718..ea6ed9e 100644
--- a/samples/SupportLeanbackDemos/build.gradle
+++ b/samples/SupportLeanbackDemos/build.gradle
@@ -10,6 +10,7 @@
defaultConfig {
minSdkVersion 17
+ targetSdkVersion project.ext.currentSdk
}
sourceSets {
diff --git a/samples/SupportLeanbackJank/AndroidManifest.xml b/samples/SupportLeanbackJank/AndroidManifest.xml
index 87be772..348f2d6 100644
--- a/samples/SupportLeanbackJank/AndroidManifest.xml
+++ b/samples/SupportLeanbackJank/AndroidManifest.xml
@@ -17,11 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.leanbackjank">
-
- <uses-sdk
- android:minSdkVersion="21"
- android:targetSdkVersion="24"/>
-
<uses-feature
android:name="android.hardware.touchscreen"
android:required="false"/>
diff --git a/samples/SupportLeanbackJank/build.gradle b/samples/SupportLeanbackJank/build.gradle
index 0b22bed..44346f7 100644
--- a/samples/SupportLeanbackJank/build.gradle
+++ b/samples/SupportLeanbackJank/build.gradle
@@ -11,6 +11,7 @@
defaultConfig {
minSdkVersion 17
+ targetSdkVersion project.ext.currentSdk
}
sourceSets {
diff --git a/samples/SupportPercentDemos/AndroidManifest.xml b/samples/SupportPercentDemos/AndroidManifest.xml
index 5c22277..c720dbd 100644
--- a/samples/SupportPercentDemos/AndroidManifest.xml
+++ b/samples/SupportPercentDemos/AndroidManifest.xml
@@ -21,9 +21,6 @@
to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.support.percent">
-
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
-
<application android:label="@string/activity_sample_code"
android:supportsRtl="true"
android:icon="@drawable/app_sample_code">
diff --git a/samples/SupportPercentDemos/build.gradle b/samples/SupportPercentDemos/build.gradle
index 78eba62..7990a21 100644
--- a/samples/SupportPercentDemos/build.gradle
+++ b/samples/SupportPercentDemos/build.gradle
@@ -9,6 +9,7 @@
defaultConfig {
minSdkVersion 14
+ targetSdkVersion project.ext.currentSdk
}
sourceSets {
diff --git a/samples/SupportPreferenceDemos/AndroidManifest.xml b/samples/SupportPreferenceDemos/AndroidManifest.xml
index f6554b3..4fb2492 100644
--- a/samples/SupportPreferenceDemos/AndroidManifest.xml
+++ b/samples/SupportPreferenceDemos/AndroidManifest.xml
@@ -19,7 +19,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.example.android.supportpreference">
- <uses-sdk android:targetSdkVersion="24"
+ <uses-sdk
tools:overrideLibrary="android.support.v17.preference, android.support.v17.leanback" />
<uses-feature android:name="android.software.Leanback" android:required="false" />
diff --git a/samples/SupportPreferenceDemos/build.gradle b/samples/SupportPreferenceDemos/build.gradle
index 572ae73..5bee5e9 100644
--- a/samples/SupportPreferenceDemos/build.gradle
+++ b/samples/SupportPreferenceDemos/build.gradle
@@ -14,6 +14,7 @@
defaultConfig {
minSdkVersion 14
+ targetSdkVersion project.ext.currentSdk
}
sourceSets {
diff --git a/samples/SupportTransitionDemos/AndroidManifest.xml b/samples/SupportTransitionDemos/AndroidManifest.xml
index a6f52db..a58c189 100644
--- a/samples/SupportTransitionDemos/AndroidManifest.xml
+++ b/samples/SupportTransitionDemos/AndroidManifest.xml
@@ -21,9 +21,6 @@
to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.support.transition">
-
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
-
<application android:label="@string/activity_sample_code"
android:supportsRtl="true"
android:icon="@drawable/app_sample_code"
diff --git a/samples/SupportTransitionDemos/build.gradle b/samples/SupportTransitionDemos/build.gradle
index c5033f7..7eda8b3 100644
--- a/samples/SupportTransitionDemos/build.gradle
+++ b/samples/SupportTransitionDemos/build.gradle
@@ -10,6 +10,7 @@
defaultConfig {
minSdkVersion 14
+ targetSdkVersion project.ext.currentSdk
}
sourceSets {
diff --git a/samples/SupportVectorDrawableDemos/AndroidManifest.xml b/samples/SupportVectorDrawableDemos/AndroidManifest.xml
index 1de3a5f..b9ccf77 100644
--- a/samples/SupportVectorDrawableDemos/AndroidManifest.xml
+++ b/samples/SupportVectorDrawableDemos/AndroidManifest.xml
@@ -16,9 +16,6 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.support.vectordrawable" >
-
- <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="23"/>
-
<application android:icon="@drawable/app_sample_code" android:label="SupportVectorDrawableDemos" >
<activity android:name="com.example.android.support.vectordrawable.app.SupportVectorDrawableDemos">
<intent-filter>
diff --git a/samples/SupportVectorDrawableDemos/build.gradle b/samples/SupportVectorDrawableDemos/build.gradle
index b7c2167..8520eb1 100644
--- a/samples/SupportVectorDrawableDemos/build.gradle
+++ b/samples/SupportVectorDrawableDemos/build.gradle
@@ -27,6 +27,7 @@
defaultConfig {
minSdkVersion 14
+ targetSdkVersion project.ext.currentSdk
vectorDrawables.useSupportLibrary = true
}