Merge downstream branch 'developers-dev' into 'klp-dev'

Reconciling topic branch changes from KLP launch preperation.

15 files changed, 58 insertions, 3 deletions

diff --git a/build.gradle b/build.gradle
index cea4d183..e1dc109e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -119,7 +119,7 @@ task emitAnt(type:Copy) {
 
 task emitGradle(type:Copy) {
     dependsOn(preflight)
-    def outputPath = outPath("gradle");
+    def outputPath = outPath("gradle")
     def inputPath = "${project.projectDir}"
     // Copy entire sample into output -- since it's already in Gradle format, we'll explicitly exclude content that
     // doesn't belong here.
@@ -129,10 +129,35 @@ task emitGradle(type:Copy) {
         // Paths to exclude from output
         exclude ".gradle"
         exclude "_index.jd"
+        exclude "bin"
         exclude "buildSrc"
+        exclude "local.properties"
         exclude "template-params.xml"
+        exclude "*.iml"
+        exclude "**/.idea"
+        exclude "**/build"
         exclude "**/proguard-project.txt"
+        exclude "${samplegen.targetSampleModule()}/**/README*.txt"
+
+        // src directory needs to be consolidated, will be done in next section
+        exclude "${samplegen.targetSampleModule()}/src/"
+    }
+
+    // Consolidate source directories
+    ["main", "common", "template"].each { input ->
+        ["java", "res", "assets"].each { filetype ->
+            def srcPath = "${inputPath}/${samplegen.targetSampleModule()}/src/${input}/${filetype}"
+            into("${samplegen.targetSampleModule()}/src/main/${filetype}") {
+                from(srcPath)
+            }
+        }
+    }
+
+    // Copy AndroidManifest.xml
+    into ("${samplegen.targetSampleModule()}/src/main") {
+        from("${inputPath}/${samplegen.targetSampleModule()}/src/main/AndroidManifest.xml")
     }
+
     // Remove BEGIN_EXCLUDE/END_EXCLUDE blocks from source files
     eachFile { file ->
         if (file.name.endsWith(".gradle") || file.name.endsWith(".java")) {
@@ -191,3 +216,15 @@ task emitBrowseable(type:Copy) {
         into(".") {from("${srcPath}/AndroidManifest.xml")}
     }
 }
+
+task emitGradleZip(dependsOn: [emitBrowseable, emitGradle], type:Zip) {
+    def outputPath = "${samplegen.pathToBuild}/out/browseable"
+    def folderName = "${samplegen.targetSampleName()}"
+    archiveName = "${samplegen.targetSampleName()}.zip"
+    def inputPath = outPath("gradle")
+    from inputPath
+    into folderName
+    include "**"
+    def outDir = project.file(outputPath)
+    destinationDir = outDir
+}
diff --git a/templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/dimens.xml b/templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/template-dimens.xml
index 22074a2b..22074a2b 100644
--- a/templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/dimens.xml
+++ b/templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/template-dimens.xml
diff --git a/templates/ActivityCards/_MODULE_/src/template/res/values/styles.xml b/templates/ActivityCards/_MODULE_/src/template/res/values/template-styles.xml
index cafe531a..cafe531a 100644
--- a/templates/ActivityCards/_MODULE_/src/template/res/values/styles.xml
+++ b/templates/ActivityCards/_MODULE_/src/template/res/values/template-styles.xml
diff --git a/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml b/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/template-dimens.xml
index 22074a2b..22074a2b 100644
--- a/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml
+++ b/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/template-dimens.xml
diff --git a/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/styles.xml b/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/template-styles.xml
index 03d19741..03d19741 100644
--- a/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/styles.xml
+++ b/templates/SimpleView/_MODULE_/src/template/res/values-sw600dp/template-styles.xml
diff --git a/templates/SimpleView/_MODULE_/src/template/res/values/styles.xml b/templates/SimpleView/_MODULE_/src/template/res/values/template-styles.xml
index d3f82ff6..d3f82ff6 100644
--- a/templates/SimpleView/_MODULE_/src/template/res/values/styles.xml
+++ b/templates/SimpleView/_MODULE_/src/template/res/values/template-styles.xml
diff --git a/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml b/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/template-dimens.xml
index 22074a2b..22074a2b 100644
--- a/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml
+++ b/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/template-dimens.xml
diff --git a/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/styles.xml b/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/template-styles.xml
index 03d19741..03d19741 100644
--- a/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/styles.xml
+++ b/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/template-styles.xml
diff --git a/templates/SingleView/_MODULE_/src/template/res/values/styles.xml b/templates/SingleView/_MODULE_/src/template/res/values/template-styles.xml
index d3f82ff6..d3f82ff6 100644
--- a/templates/SingleView/_MODULE_/src/template/res/values/styles.xml
+++ b/templates/SingleView/_MODULE_/src/template/res/values/template-styles.xml
diff --git a/templates/base/README.txt b/templates/base/README.txt
new file mode 100644
index 00000000..9616c582
--- /dev/null
+++ b/templates/base/README.txt
@@ -0,0 +1,18 @@
+Build Instructions
+-------------------
+
+This sample uses the Gradle build system. To build this project, use the
+"gradlew build" command or use "Import Project" in Android Studio.
+
+To see a list of all available commands, run "gradlew tasks".
+
+Dependencies
+-------------
+
+- Android SDK Build-tools v18.1
+- Android Support Repository v2
+
+Dependencies are available for download via the Android SDK Manager.
+
+Android Studio is available for download at:
+    http://developer.android.com/sdk/installing/studio.html
diff --git a/templates/base/_MODULE_/src/template/res/values-sw600dp/dimens.xml b/templates/base/_MODULE_/src/template/res/values-sw600dp/template-dimens.xml
index 22074a2b..22074a2b 100644
--- a/templates/base/_MODULE_/src/template/res/values-sw600dp/dimens.xml
+++ b/templates/base/_MODULE_/src/template/res/values-sw600dp/template-dimens.xml
diff --git a/templates/base/_MODULE_/src/template/res/values-sw600dp/styles.xml b/templates/base/_MODULE_/src/template/res/values-sw600dp/template-styles.xml
index 03d19741..03d19741 100644
--- a/templates/base/_MODULE_/src/template/res/values-sw600dp/styles.xml
+++ b/templates/base/_MODULE_/src/template/res/values-sw600dp/template-styles.xml
diff --git a/templates/base/_MODULE_/src/template/res/values/dimens.xml b/templates/base/_MODULE_/src/template/res/values/template-dimens.xml
index 39e710b5..39e710b5 100644
--- a/templates/base/_MODULE_/src/template/res/values/dimens.xml
+++ b/templates/base/_MODULE_/src/template/res/values/template-dimens.xml
diff --git a/templates/base/_MODULE_/src/template/res/values/styles.xml b/templates/base/_MODULE_/src/template/res/values/template-styles.xml
index 404623e3..404623e3 100644
--- a/templates/base/_MODULE_/src/template/res/values/styles.xml
+++ b/templates/base/_MODULE_/src/template/res/values/template-styles.xml
diff --git a/templates/include/common.ftl b/templates/include/common.ftl
index 15ce49d9..59f64107 100644
--- a/templates/include/common.ftl
+++ b/templates/include/common.ftl
@@ -39,9 +39,9 @@
 <#elseif (sample.compileSdkVersion)?has_content>
     <#assign compile_sdk = sample.compileSdkVersion/>
 <#else>
-    <#assign compile_sdk = 18/>
+    <#assign compile_sdk = 19/>
 </#if>
 
 
 <#-- Set the global build tools version -->
-<#assign build_tools_version='"18.0.1"'/>
+<#assign build_tools_version='"18.1"'/>