samples: Remove compileSdkVersion/targetSdkVersion from template-parms

With the exception of API 24 samples, remove references to
<compileSdkVersion> and <targetSdkVersion> from template-params.xml.
These should be centrally managed.

Change-Id: Iae5dadc9728fc5440a9521d2299041134eea8cea

17 files changed, 3 insertions, 40 deletions

diff --git a/admin/BasicManagedProfile/template-params.xml b/admin/BasicManagedProfile/template-params.xml
index ff926ab5..313a5879 100644
--- a/admin/BasicManagedProfile/template-params.xml
+++ b/admin/BasicManagedProfile/template-params.xml
@@ -22,12 +22,8 @@
     <group>Admin</group>
     <package>com.example.android.basicmanagedprofile</package>
 
-
-
     <!-- change minSdk if needed-->
     <minSdk>21</minSdk>
-    <compileSdkVersion>21</compileSdkVersion>
-
 
     <strings>
         <intro>
@@ -36,7 +32,7 @@
             enable or disable other apps and how to set restrictions to them. Intents can be
             configured to be forwarded between primary account and managed profile. Finally, you can
             wipe all the data associated with the profile.
-            Note that there can only be one managed profile on a device. 
+            Note that there can only be one managed profile on a device.
             ]]>
         </intro>
     </strings>
diff --git a/background/JobScheduler/template-params.xml b/background/JobScheduler/template-params.xml
index 2a6197b4..f521f6bc 100644
--- a/background/JobScheduler/template-params.xml
+++ b/background/JobScheduler/template-params.xml
@@ -24,7 +24,6 @@
 
     <!-- change minSdk if needed-->
     <minSdk>21</minSdk>
-    <compileSdkVersion>21</compileSdkVersion>
 
     <strings>
         <intro>
diff --git a/content/DirectShare/template-params.xml b/content/DirectShare/template-params.xml
index bc69228c..8585bdbb 100644
--- a/content/DirectShare/template-params.xml
+++ b/content/DirectShare/template-params.xml
@@ -18,9 +18,8 @@
     <name>DirectShare</name>
     <group>Content</group>
     <package>com.example.android.directshare</package>
+
     <minSdk>23</minSdk>
-    <targetSdkVersion>23</targetSdkVersion>
-    <compileSdkVersion>23</compileSdkVersion>
 
     <strings>
         <intro>
diff --git a/media/HdrViewfinder/template-params.xml b/media/HdrViewfinder/template-params.xml
index baf1eaad..bac09925 100644
--- a/media/HdrViewfinder/template-params.xml
+++ b/media/HdrViewfinder/template-params.xml
@@ -20,8 +20,6 @@
     <package>com.example.android.hdrviewfinder</package>
 
     <minSdk>21</minSdk>
-    <targetSdkVersion>23</targetSdkVersion>
-    <compileSdkVersion>23</compileSdkVersion>
 
     <dependency>com.android.support:design:24.0.0-beta1</dependency>
 
diff --git a/media/MidiScope/template-params.xml b/media/MidiScope/template-params.xml
index 4125248b..cbc0e54c 100644
--- a/media/MidiScope/template-params.xml
+++ b/media/MidiScope/template-params.xml
@@ -19,7 +19,6 @@
     <group>Media</group>
     <package>com.example.android.midiscope</package>
     <minSdk>23</minSdk>
-    <compileSdkVersion>23</compileSdkVersion>
 
     <strings>
         <intro>
diff --git a/security/AsymmetricFingerprintDialog/template-params.xml b/security/AsymmetricFingerprintDialog/template-params.xml
index 019a132c..ec8fbd0d 100644
--- a/security/AsymmetricFingerprintDialog/template-params.xml
+++ b/security/AsymmetricFingerprintDialog/template-params.xml
@@ -25,8 +25,6 @@
     <package>com.example.android.asymmetricfingerprintdialog</package>
 
     <minSdk>23</minSdk>
-    <targetSdkVersion>23</targetSdkVersion>
-    <compileSdkVersion>23</compileSdkVersion>
 
     <dependency>com.squareup.dagger:dagger:1.2.2</dependency>
     <dependency>com.squareup.dagger:dagger-compiler:1.2.2</dependency>
diff --git a/security/ConfirmCredential/template-params.xml b/security/ConfirmCredential/template-params.xml
index d803a891..ca6cf6bc 100644
--- a/security/ConfirmCredential/template-params.xml
+++ b/security/ConfirmCredential/template-params.xml
@@ -25,8 +25,6 @@
     <package>com.example.android.confirmcredential</package>
 
     <minSdk>23</minSdk>
-    <targetSdkVersion>23</targetSdkVersion>
-    <compileSdkVersion>23</compileSdkVersion>
 
     <strings>
         <intro>
diff --git a/security/FingerprintDialog/template-params.xml b/security/FingerprintDialog/template-params.xml
index cb1d2767..c13a82f6 100644
--- a/security/FingerprintDialog/template-params.xml
+++ b/security/FingerprintDialog/template-params.xml
@@ -25,8 +25,6 @@
     <package>com.example.android.fingerprintdialog</package>
 
     <minSdk>23</minSdk>
-    <targetSdkVersion>23</targetSdkVersion>
-    <compileSdkVersion>23</compileSdkVersion>
 
     <strings>
         <intro>
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/template-params.xml b/ui/activityscenetransition/ActivitySceneTransitionBasic/template-params.xml
index 85e24b30..75d978a1 100644
--- a/ui/activityscenetransition/ActivitySceneTransitionBasic/template-params.xml
+++ b/ui/activityscenetransition/ActivitySceneTransitionBasic/template-params.xml
@@ -23,7 +23,6 @@
     <package>com.example.android.activityscenetransitionbasic</package>
 
     <minSdk>21</minSdk>
-    <compileSdkVersion>21</compileSdkVersion>
 
     <dependency>com.squareup.picasso:picasso:2.4.0</dependency>
 
diff --git a/ui/graphics/PdfRendererBasic/template-params.xml b/ui/graphics/PdfRendererBasic/template-params.xml
index f8607b27..79ebf173 100644
--- a/ui/graphics/PdfRendererBasic/template-params.xml
+++ b/ui/graphics/PdfRendererBasic/template-params.xml
@@ -22,12 +22,8 @@
     <group>UI</group>
     <package>com.example.android.pdfrendererbasic</package>
 
-
-
     <!-- change minSdk if needed-->
     <minSdk>21</minSdk>
-    <compileSdkVersion>21</compileSdkVersion>
-
 
     <strings>
         <intro>
diff --git a/ui/views/CardView/template-params.xml b/ui/views/CardView/template-params.xml
index 7adf2321..30ff32f7 100644
--- a/ui/views/CardView/template-params.xml
+++ b/ui/views/CardView/template-params.xml
@@ -26,7 +26,6 @@
 
     <!-- change minSdk if needed-->
     <minSdk>21</minSdk>
-    <compileSdkVersion>21</compileSdkVersion>
 
     <dependency>com.android.support:cardview-v7:24.0.0-beta1</dependency>
 
diff --git a/ui/views/Clipping/ClippingBasic/template-params.xml b/ui/views/Clipping/ClippingBasic/template-params.xml
index a33790e6..6dd25a2f 100644
--- a/ui/views/Clipping/ClippingBasic/template-params.xml
+++ b/ui/views/Clipping/ClippingBasic/template-params.xml
@@ -22,10 +22,7 @@
     <group>UI</group>
     <package>com.example.android.clippingbasic</package>
 
-
     <minSdk>21</minSdk>
-    <compileSdkVersion>21</compileSdkVersion>
-
 
     <strings>
         <intro>
diff --git a/ui/views/Elevation/ElevationBasic/template-params.xml b/ui/views/Elevation/ElevationBasic/template-params.xml
index bcaa253c..e51ffb63 100644
--- a/ui/views/Elevation/ElevationBasic/template-params.xml
+++ b/ui/views/Elevation/ElevationBasic/template-params.xml
@@ -22,12 +22,8 @@
     <group>UI</group>
     <package>com.example.android.elevationbasic</package>
 
-
-
     <!-- change minSdk if needed-->
     <minSdk>21</minSdk>
-    <compileSdkVersion>21</compileSdkVersion>
-
 
     <strings>
         <intro>
diff --git a/ui/views/Elevation/ElevationDrag/template-params.xml b/ui/views/Elevation/ElevationDrag/template-params.xml
index 9bd511c2..ebdc4494 100644
--- a/ui/views/Elevation/ElevationDrag/template-params.xml
+++ b/ui/views/Elevation/ElevationDrag/template-params.xml
@@ -22,11 +22,8 @@
     <group>UI</group>
     <package>com.example.android.elevationdrag</package>
 
-
     <!-- change minSdk if needed-->
     <minSdk>21</minSdk>
-    <compileSdkVersion>21</compileSdkVersion>
-
 
     <strings>
         <intro>
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/template-params.xml b/ui/views/FloatingActionButton/FloatingActionButtonBasic/template-params.xml
index 66533b7f..7a899d77 100644
--- a/ui/views/FloatingActionButton/FloatingActionButtonBasic/template-params.xml
+++ b/ui/views/FloatingActionButton/FloatingActionButtonBasic/template-params.xml
@@ -19,7 +19,7 @@
     <group>UI</group>
     <package>com.example.android.floatingactionbuttonbasic</package>
     <minSdk>21</minSdk>
-    <compileSdkVersion>21</compileSdkVersion>
+
     <strings>
         <intro>
             <![CDATA[
diff --git a/ui/views/NavigationDrawer/template-params.xml b/ui/views/NavigationDrawer/template-params.xml
index 9ada1f27..12ea60ac 100644
--- a/ui/views/NavigationDrawer/template-params.xml
+++ b/ui/views/NavigationDrawer/template-params.xml
@@ -26,8 +26,6 @@
 
     <!-- change minSdk if needed-->
     <minSdk>21</minSdk>
-    <compileSdkVersion>23</compileSdkVersion>
-
 
     <dependency>com.android.support:support-v13:24.0.0-beta1</dependency>
     <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
diff --git a/ui/views/RevealEffect/RevealEffectBasic/template-params.xml b/ui/views/RevealEffect/RevealEffectBasic/template-params.xml
index a8c39edd..ad9a111b 100644
--- a/ui/views/RevealEffect/RevealEffectBasic/template-params.xml
+++ b/ui/views/RevealEffect/RevealEffectBasic/template-params.xml
@@ -22,11 +22,7 @@
     <group>UI</group>
     <package>com.example.android.revealeffectbasic</package>
 
-
-
     <minSdk>21</minSdk>
-    <compileSdkVersion>21</compileSdkVersion>
-
 
     <strings>
         <intro>