Resolved conflicts for merge 'f1f417b4' to lmp-dev

- Renamed modules <sampleName>Sample to Application
- fixed cached buildSrc using old SampleGenPlugin

Conflicts:
	build.gradle

Change-Id: Id7f98518188837ba6da11043314fbc5dffdbb59a

42 files changed, 126 insertions, 11 deletions

diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/.gitignore b/ui/window/AdvancedImmersiveMode/Application/.gitignore
index ce281edf..ce281edf 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/.gitignore
+++ b/ui/window/AdvancedImmersiveMode/Application/.gitignore
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/README-fragmentview.txt b/ui/window/AdvancedImmersiveMode/Application/README-fragmentview.txt
index 38d903f0..38d903f0 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/README-fragmentview.txt
+++ b/ui/window/AdvancedImmersiveMode/Application/README-fragmentview.txt
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/README-singleview.txt b/ui/window/AdvancedImmersiveMode/Application/README-singleview.txt
index 0cacd467..0cacd467 100644
--- a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/README-singleview.txt
+++ b/ui/window/AdvancedImmersiveMode/Application/README-singleview.txt
diff --git a/ui/window/AdvancedImmersiveMode/Application/build.gradle b/ui/window/AdvancedImmersiveMode/Application/build.gradle
new file mode 100644
index 00000000..111d4f77
--- /dev/null
+++ b/ui/window/AdvancedImmersiveMode/Application/build.gradle
@@ -0,0 +1,64 @@
+
+
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.12.+'
+    }
+}
+
+apply plugin: 'com.android.application'
+
+
+dependencies {
+
+    compile "com.android.support:support-v4:20.+"
+    compile "com.android.support:support-v13:20.+"
+
+}
+
+// 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 19
+
+    buildToolsVersion "20.0.0"
+
+    sourceSets {
+        main {
+            dirs.each { dir ->
+                java.srcDirs "src/${dir}/java"
+                res.srcDirs "src/${dir}/res"
+            }
+        }
+        androidTest.setRoot('tests')
+        androidTest.java.srcDirs = ['tests/src']
+
+    }
+
+}
+// BEGIN_EXCLUDE
+// Tasks below this line will be hidden from release output
+
+task preflight (dependsOn: parent.preflight) {
+    project.afterEvaluate {
+        // Inject a preflight task into each variant so we have a place to hook tasks
+        // that need to run before any of the android build tasks.
+        //
+        android.applicationVariants.each { variant ->
+            tasks.getByPath("prepare${variant.name.capitalize()}Dependencies").dependsOn preflight
+        }
+    }
+}
+
+// END_EXCLUDE
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/proguard-project.txt b/ui/window/AdvancedImmersiveMode/Application/proguard-project.txt
index 0d8f171d..0d8f171d 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/proguard-project.txt
+++ b/ui/window/AdvancedImmersiveMode/Application/proguard-project.txt
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/AndroidManifest.xml b/ui/window/AdvancedImmersiveMode/Application/src/main/AndroidManifest.xml
index 1d01856c..1d01856c 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/AndroidManifest.xml
+++ b/ui/window/AdvancedImmersiveMode/Application/src/main/AndroidManifest.xml
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java b/ui/window/AdvancedImmersiveMode/Application/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
index d8fb0d4e..d8fb0d4e 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
+++ b/ui/window/AdvancedImmersiveMode/Application/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
index b96e6a54..b96e6a54 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
index 1294d5b7..1294d5b7 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
index 9f101ffa..9f101ffa 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
index 7a195a12..7a195a12 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/layout/fragment_flags.xml b/ui/window/AdvancedImmersiveMode/Application/src/main/res/layout/fragment_flags.xml
index 2c74e83f..2c74e83f 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/layout/fragment_flags.xml
+++ b/ui/window/AdvancedImmersiveMode/Application/src/main/res/layout/fragment_flags.xml
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/AndroidManifest.xml b/ui/window/AdvancedImmersiveMode/Application/tests/AndroidManifest.xml
index 71179696..71179696 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/AndroidManifest.xml
+++ b/ui/window/AdvancedImmersiveMode/Application/tests/AndroidManifest.xml
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java b/ui/window/AdvancedImmersiveMode/Application/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java
index 541791ae..541791ae 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java
+++ b/ui/window/AdvancedImmersiveMode/Application/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java
diff --git a/ui/window/AdvancedImmersiveMode/buildSrc/build.gradle b/ui/window/AdvancedImmersiveMode/buildSrc/build.gradle
index 490642de..e344a8cb 100644
--- a/ui/window/AdvancedImmersiveMode/buildSrc/build.gradle
+++ b/ui/window/AdvancedImmersiveMode/buildSrc/build.gradle
@@ -1,8 +1,18 @@
+
+
+
 repositories {
     mavenCentral()
 }
-
 dependencies {
     compile 'org.freemarker:freemarker:2.3.20'
-    compile files("libs/buildSrc.jar")
 }
+
+sourceSets {
+    main {
+        groovy {
+            srcDir new File(rootDir, "../../../../../../build/buildSrc/src/main/groovy")
+        }
+    }
+}
+
diff --git a/ui/window/AdvancedImmersiveMode/buildSrc/libs/buildSrc.jar b/ui/window/AdvancedImmersiveMode/buildSrc/libs/buildSrc.jar
deleted file mode 100644
index 8154696a..00000000
--- a/ui/window/AdvancedImmersiveMode/buildSrc/libs/buildSrc.jar
+++ /dev/null
diff --git a/ui/window/AdvancedImmersiveMode/settings.gradle b/ui/window/AdvancedImmersiveMode/settings.gradle
index 0f7ed4b0..9464a359 100644
--- a/ui/window/AdvancedImmersiveMode/settings.gradle
+++ b/ui/window/AdvancedImmersiveMode/settings.gradle
@@ -1 +1 @@
-include 'AdvancedImmersiveModeSample'
+include 'Application'
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/.gitignore b/ui/window/BasicImmersiveMode/Application/.gitignore
index 6eb878d4..6eb878d4 100644
--- a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/.gitignore
+++ b/ui/window/BasicImmersiveMode/Application/.gitignore
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/README-singleview.txt b/ui/window/BasicImmersiveMode/Application/README-singleview.txt
index 0cacd467..0cacd467 100644
--- a/ui/window/ImmersiveMode/ImmersiveModeSample/README-singleview.txt
+++ b/ui/window/BasicImmersiveMode/Application/README-singleview.txt
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/proguard-project.txt b/ui/window/BasicImmersiveMode/Application/proguard-project.txt
index 0d8f171d..0d8f171d 100644
--- a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/proguard-project.txt
+++ b/ui/window/BasicImmersiveMode/Application/proguard-project.txt
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/AndroidManifest.xml b/ui/window/BasicImmersiveMode/Application/src/main/AndroidManifest.xml
index 00b4e3c6..00b4e3c6 100644
--- a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/AndroidManifest.xml
+++ b/ui/window/BasicImmersiveMode/Application/src/main/AndroidManifest.xml
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java b/ui/window/BasicImmersiveMode/Application/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java
index a675e05b..a675e05b 100644
--- a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java
+++ b/ui/window/BasicImmersiveMode/Application/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/window/BasicImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
index b1efaf4b..b1efaf4b 100644
--- a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/ui/window/BasicImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/window/BasicImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
index f5f9244f..f5f9244f 100644
--- a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/ui/window/BasicImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/window/BasicImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
index 5d07b3f0..5d07b3f0 100644
--- a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/ui/window/BasicImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/window/BasicImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
index 6ef21e1f..6ef21e1f 100644
--- a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/ui/window/BasicImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/tests/AndroidManifest.xml b/ui/window/BasicImmersiveMode/Application/tests/AndroidManifest.xml
index 070368c0..070368c0 100644
--- a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/tests/AndroidManifest.xml
+++ b/ui/window/BasicImmersiveMode/Application/tests/AndroidManifest.xml
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java b/ui/window/BasicImmersiveMode/Application/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java
index 31c25bb9..31c25bb9 100644
--- a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java
+++ b/ui/window/BasicImmersiveMode/Application/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java
diff --git a/ui/window/BasicImmersiveMode/settings.gradle b/ui/window/BasicImmersiveMode/settings.gradle
index 8dda3839..9464a359 100644
--- a/ui/window/BasicImmersiveMode/settings.gradle
+++ b/ui/window/BasicImmersiveMode/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicImmersiveModeSample'
+include 'Application'
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/.gitignore b/ui/window/ImmersiveMode/Application/.gitignore
index 6eb878d4..6eb878d4 100644
--- a/ui/window/ImmersiveMode/ImmersiveModeSample/.gitignore
+++ b/ui/window/ImmersiveMode/Application/.gitignore
diff --git a/ui/window/ImmersiveMode/Application/README-singleview.txt b/ui/window/ImmersiveMode/Application/README-singleview.txt
new file mode 100644
index 00000000..0cacd467
--- /dev/null
+++ b/ui/window/ImmersiveMode/Application/README-singleview.txt
@@ -0,0 +1,47 @@
+<#--
+        Copyright 2013 The Android Open Source Project
+
+        Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+-->
+
+Steps to implement SingleView template:
+-in template-params.xml.ftl:
+    -add the following line to common imports
+        <common src="activities"/>
+
+    -add a string for the action button's text using the element name "sample_action".
+    This element should be a child of <strings>:
+        <strings>
+        ...
+        <sample_action>ButtonText</sample_action>
+        ...
+        </strings>
+
+
+
+-Add a Fragment to handle behavior.  In your MainActivity.java class, it will reference a Fragment
+ called (yourProjectName)Fragment.java.  Create that file in your project, using the "main" source
+ folder instead of "common" or "templates".
+   For instance, if your package name is com.example.foo, create the file
+   src/main/java/com/example/foo/FooFragment.java
+
+
+-Within this fragment, make sure that the onCreate method has the line
+ "setHasOptionsMenu(true);", to enable the fragment to handle menu events.
+
+-In order to override menu events, override onOptionsItemSelected.
+
+-refer to sampleSamples/singleViewSample for a reference implementation of a
+project built on this template.
+
+
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/proguard-project.txt b/ui/window/ImmersiveMode/Application/proguard-project.txt
index 0d8f171d..0d8f171d 100644
--- a/ui/window/ImmersiveMode/ImmersiveModeSample/proguard-project.txt
+++ b/ui/window/ImmersiveMode/Application/proguard-project.txt
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/AndroidManifest.xml b/ui/window/ImmersiveMode/Application/src/main/AndroidManifest.xml
index 72a60ce1..72a60ce1 100644
--- a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/AndroidManifest.xml
+++ b/ui/window/ImmersiveMode/Application/src/main/AndroidManifest.xml
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java b/ui/window/ImmersiveMode/Application/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java
index 8a7255cf..8a7255cf 100644
--- a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java
+++ b/ui/window/ImmersiveMode/Application/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/window/ImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
index b1efaf4b..b1efaf4b 100644
--- a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/ui/window/ImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/window/ImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
index f5f9244f..f5f9244f 100644
--- a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/ui/window/ImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/window/ImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
index 5d07b3f0..5d07b3f0 100644
--- a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/ui/window/ImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/window/ImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
index 6ef21e1f..6ef21e1f 100644
--- a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/ui/window/ImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/tests/AndroidManifest.xml b/ui/window/ImmersiveMode/Application/tests/AndroidManifest.xml
index b0901892..b0901892 100644
--- a/ui/window/ImmersiveMode/ImmersiveModeSample/tests/AndroidManifest.xml
+++ b/ui/window/ImmersiveMode/Application/tests/AndroidManifest.xml
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java b/ui/window/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java
index eb803754..eb803754 100644
--- a/ui/window/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java
+++ b/ui/window/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/SampleTests.java b/ui/window/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/SampleTests.java
index 162b3bde..162b3bde 100644
--- a/ui/window/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/SampleTests.java
+++ b/ui/window/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/SampleTests.java
diff --git a/ui/window/ImmersiveMode/settings.gradle b/ui/window/ImmersiveMode/settings.gradle
index d13a7a1d..9464a359 100644
--- a/ui/window/ImmersiveMode/settings.gradle
+++ b/ui/window/ImmersiveMode/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ImmersiveModeSample'
+include 'Application'