Update samples to use API 24

Template output to update samples to use API 24 instead off
'N'. (Includes manual changes to MultiWindowPlayground.)

Also any supplamentary changes to templates that haven't been
checked in, since we don't usually check in template output.

Change-Id: Id16ec84fddcbf6b11218aaf22475413b156449bd

7 files changed, 75 insertions, 15 deletions

diff --git a/ui/window/AdvancedImmersiveMode/Application/build.gradle b/ui/window/AdvancedImmersiveMode/Application/build.gradle
new file mode 100644
index 00000000..ebbee866
--- /dev/null
+++ b/ui/window/AdvancedImmersiveMode/Application/build.gradle
@@ -0,0 +1,59 @@
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.2'
+    }
+}
+
+apply plugin: 'com.android.application'
+
+repositories {
+    jcenter()
+}
+
+dependencies {
+    compile "com.android.support:support-v4:24.1.1"
+    compile "com.android.support:support-v13:24.1.1"
+    compile "com.android.support:cardview-v7:24.1.1"
+    compile "com.android.support:appcompat-v7:24.1.1"
+}
+
+// The sample build uses multiple directories to
+// keep boilerplate and common code separate from
+// the main sample code.
+List<String> dirs = [
+    'main',     // main sample code; look here for the interesting stuff.
+    'common',   // components that are reused by multiple samples
+    'template'] // boilerplate code that is generated by the sample template process
+
+android {
+    compileSdkVersion 24
+    buildToolsVersion "24.0.1"
+
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 24
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    sourceSets {
+        main {
+            dirs.each { dir ->
+                java.srcDirs "src/${dir}/java"
+                res.srcDirs "src/${dir}/res"
+            }
+        }
+        androidTest.setRoot('tests')
+        androidTest.java.srcDirs = ['tests/src']
+
+    }
+
+}
diff --git a/ui/window/AdvancedImmersiveMode/README.md b/ui/window/AdvancedImmersiveMode/README.md
index a00087de..1e1b7936 100644
--- a/ui/window/AdvancedImmersiveMode/README.md
+++ b/ui/window/AdvancedImmersiveMode/README.md
@@ -26,8 +26,8 @@ appear.
 Pre-requisites
 --------------
 
-- Android SDK v23
-- Android Build Tools v23.0.0
+- Android SDK 24
+- Android Build Tools v24.0.1
 - Android Support Repository
 
 Screenshots
@@ -56,7 +56,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de
 License
 -------
 
-Copyright 2014 The Android Open Source Project, Inc.
+Copyright 2016 The Android Open Source Project, Inc.
 
 Licensed to the Apache Software Foundation (ASF) under one or more contributor
 license agreements.  See the NOTICE file distributed with this work for
diff --git a/ui/window/BasicImmersiveMode/README.md b/ui/window/BasicImmersiveMode/README.md
index 613833c5..593e72ef 100644
--- a/ui/window/BasicImmersiveMode/README.md
+++ b/ui/window/BasicImmersiveMode/README.md
@@ -19,8 +19,8 @@ SYSTEM_UI_FLAG_IMMERSIVE system ui flag. When combined with the SYSTEM_UI_FLAG_H
 Pre-requisites
 --------------
 
-- Android SDK v23
-- Android Build Tools v23.0.0
+- Android SDK 24
+- Android Build Tools v24.0.1
 - Android Support Repository
 
 Screenshots
@@ -49,7 +49,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de
 License
 -------
 
-Copyright 2014 The Android Open Source Project, Inc.
+Copyright 2016 The Android Open Source Project, Inc.
 
 Licensed to the Apache Software Foundation (ASF) under one or more contributor
 license agreements.  See the NOTICE file distributed with this work for
diff --git a/ui/window/ImmersiveMode/README.md b/ui/window/ImmersiveMode/README.md
index 4002eb4c..f9c0bd9a 100644
--- a/ui/window/ImmersiveMode/README.md
+++ b/ui/window/ImmersiveMode/README.md
@@ -9,8 +9,8 @@ click the "Toggle immersive mode" button, then try swiping the bar in and out!
 Pre-requisites
 --------------
 
-- Android SDK v23
-- Android Build Tools v23.0.0
+- Android SDK 24
+- Android Build Tools v24.0.1
 - Android Support Repository
 
 Getting Started
@@ -34,7 +34,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de
 License
 -------
 
-Copyright 2014 The Android Open Source Project, Inc.
+Copyright 2016 The Android Open Source Project, Inc.
 
 Licensed to the Apache Software Foundation (ASF) under one or more contributor
 license agreements.  See the NOTICE file distributed with this work for
diff --git a/ui/window/MultiWindowPlayground/.google/packaging.yaml b/ui/window/MultiWindowPlayground/.google/packaging.yaml
index a6ca69ec..a2ac75a8 100644
--- a/ui/window/MultiWindowPlayground/.google/packaging.yaml
+++ b/ui/window/MultiWindowPlayground/.google/packaging.yaml
@@ -4,7 +4,7 @@
 # This file is used by Google as part of our samples packaging process.
 # End users may safely ignore this file. It has no relevance to other systems.
 ---
-status:       DRAFT
+status:       PUBLISHED
 technologies: [Android]
 categories:   [Android N Preview]
 languages:    [Java]
diff --git a/ui/window/MultiWindowPlayground/Application/build.gradle b/ui/window/MultiWindowPlayground/Application/build.gradle
index 9d6d0b8e..87039df3 100644
--- a/ui/window/MultiWindowPlayground/Application/build.gradle
+++ b/ui/window/MultiWindowPlayground/Application/build.gradle
@@ -33,13 +33,13 @@ allprojects {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion '24'
+    compileSdkVersion 24
     buildToolsVersion '23.0.3'
 
     defaultConfig {
         applicationId "com.android.multiwindowplayground"
-        minSdkVersion 'N'
-        targetSdkVersion 'N'
+        minSdkVersion 24
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/ui/window/MultiWindowPlayground/README.md b/ui/window/MultiWindowPlayground/README.md
index ea73dc10..1dd616fe 100644
--- a/ui/window/MultiWindowPlayground/README.md
+++ b/ui/window/MultiWindowPlayground/README.md
@@ -47,8 +47,9 @@ Alternatively, the preferred and minimum sizes can be set in a new
 
 Pre-requisites
 --------------
-- Android SDK Preview N
-- Android Build Tools v23.0.0
+
+- Android SDK 24
+- Android Build Tools v24.0.1
 - Android Support Repository
 
 Screenshots