Merge "Updating build.gradle and template-params for MNC samples" into mnc-dev
diff --git a/build.gradle b/build.gradle
index cdaf043..05ed3ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -99,6 +99,13 @@
"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 e105906..b1b892b 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 8d34864..ed21898 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 f0f7c4d..3916c57 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 3baefc6..0610712 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 92021d4..c794d50 100644
--- a/system/RuntimePermissionsBasic/template-params.xml
+++ b/system/RuntimePermissionsBasic/template-params.xml
@@ -38,7 +38,7 @@
<template src="base"/>
<metadata>
- <status>PUBLISHED</status>
+ <status>DRAFT</status>
<categories>System</categories>
<technologies>Android</technologies>
<languages>Java</languages>