From 415e5ce8ad7128bed20c28e923f2f91bbfff46a9 Mon Sep 17 00:00:00 2001
From: Trevor Johns <trevorjohns@google.com>
Date: Wed, 27 May 2015 12:21:44 -0700
Subject: Updating build.gradle and template-params for MNC samples

- Including new samples in master build
- Adjusting min/target/compile SDK levels to match public preview
- Setting all samples to DRAFT

Change-Id: I6b051160a87de79b9db2d7d79f8f3242efe303fb
---
 build.gradle                                         | 7 +++++++
 notification/ActiveNotifications/template-params.xml | 4 ++--
 security/ConfirmCredential/template-params.xml       | 4 ++--
 security/FingerprintDialog/template-params.xml       | 3 ++-
 system/RuntimePermissions/template-params.xml        | 2 +-
 system/RuntimePermissionsBasic/template-params.xml   | 2 +-
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index cdaf0430..05ed3eaf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -99,6 +99,13 @@ List<String> samples = [
 "wearable/wear/XYZTouristAttractions",
 "connectivity/bluetooth/BluetoothAdvertisements",
 "wearable/wear/AlwaysOn",
+"security/ConfirmCredential",
+"security/FingerprintDialog",
+"system/RuntimePermissions",
+"system/RuntimePermissionsBasic",
+"notification/ActiveNotifications",
+"media/Camera2Raw",
+"content/AutoBackupForApps",
 ]
 
 List<String> taskNames = [
diff --git a/notification/ActiveNotifications/template-params.xml b/notification/ActiveNotifications/template-params.xml
index e1059060..b1b892b6 100644
--- a/notification/ActiveNotifications/template-params.xml
+++ b/notification/ActiveNotifications/template-params.xml
@@ -20,8 +20,8 @@
                             and replaced with the "categories" tags below. -->
     <package>com.example.android.activenotifications</package>
 
-    <!-- change minSdk if needed-->
-    <minSdk>"android-MNC"</minSdk>
+    <minSdk>"MNC"</minSdk>
+    <targetSdkVersion>"MNC"</targetSdkVersion>
     <compileSdkVersion>"android-MNC"</compileSdkVersion>
 
     <!-- Include additional dependencies here.-->
diff --git a/security/ConfirmCredential/template-params.xml b/security/ConfirmCredential/template-params.xml
index 8d34864a..ed21898d 100644
--- a/security/ConfirmCredential/template-params.xml
+++ b/security/ConfirmCredential/template-params.xml
@@ -24,8 +24,8 @@
     <group>security</group>
     <package>com.example.android.confirmcredential</package>
 
-    <!-- change minSdk if needed-->
-    <minSdk>"android-MNC"</minSdk>
+    <minSdk>"MNC"</minSdk>
+    <targetSdkVersion>"MNC"</targetSdkVersion>
     <compileSdkVersion>"android-MNC"</compileSdkVersion>
 
     <strings>
diff --git a/security/FingerprintDialog/template-params.xml b/security/FingerprintDialog/template-params.xml
index f0f7c4dc..3916c57a 100644
--- a/security/FingerprintDialog/template-params.xml
+++ b/security/FingerprintDialog/template-params.xml
@@ -24,7 +24,8 @@
     <group>security</group>
     <package>com.example.android.fingerprintdialog</package>
 
-    <minSdk>"android-MNC"</minSdk>
+    <minSdk>"MNC"</minSdk>
+    <targetSdkVersion>"MNC"</targetSdkVersion>
     <compileSdkVersion>"android-MNC"</compileSdkVersion>
 
     <dependency>com.squareup.dagger:dagger:1.2.2</dependency>
diff --git a/system/RuntimePermissions/template-params.xml b/system/RuntimePermissions/template-params.xml
index 3baefc65..06107127 100644
--- a/system/RuntimePermissions/template-params.xml
+++ b/system/RuntimePermissions/template-params.xml
@@ -41,7 +41,7 @@
     <common src="activities"/>
 
     <metadata>
-        <status>PUBLISHED</status>
+        <status>DRAFT</status>
         <categories>System</categories>
         <technologies>Android</technologies>
         <languages>Java</languages>
diff --git a/system/RuntimePermissionsBasic/template-params.xml b/system/RuntimePermissionsBasic/template-params.xml
index 92021d4a..c794d50d 100644
--- a/system/RuntimePermissionsBasic/template-params.xml
+++ b/system/RuntimePermissionsBasic/template-params.xml
@@ -38,7 +38,7 @@ Note: The "RuntimePermissions" sample provides a more complete overview over the
     <template src="base"/>
 
     <metadata>
-        <status>PUBLISHED</status>
+        <status>DRAFT</status>
         <categories>System</categories>
         <technologies>Android</technologies>
         <languages>Java</languages>
-- 
cgit v1.2.3