Merge branch 'lmp-preview-release' into lmp-dev

Merging changes from lmp-preview into lmp-dev in preperation for
official SDK release.

Merge applied using commit 'a01f649af64cb7bfc421eec8607326b6cde58700'
as a merge point in order to avoid a DNM commit that followed it.

Conflicts:
	prebuilts/gradle/Basic/BasicSample/src/main/res/values/ids.xml
	prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/menu/navigation_drawer.xml
	templates/CardStream/_MODULE_/src/template/res/drawable-v21/card_action_bg.xml
	templates/base/_MODULE_/build.gradle.ftl

Change-Id: Iffd912222d8329e120ae3b2c916967c3924941d9

4 files changed, 8 insertions, 64 deletions

diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/fragmentview_strings.xml
deleted file mode 100755
index 7b9d9ec4..00000000
--- a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/fragmentview_strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-  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.
--->
-<resources>
-    <string name="sample_show_log">Show Log</string>
-    <string name="sample_hide_log">Hide Log</string>
-</resources>
diff --git a/templates/create/_MODULE_/build.gradle.ftl b/templates/create/_MODULE_/build.gradle.ftl
index fd3461a4..7e48dd4c 100644
--- a/templates/create/_MODULE_/build.gradle.ftl
+++ b/templates/create/_MODULE_/build.gradle.ftl
@@ -37,6 +37,11 @@ android {
           to always use the most current SDK as their target. -->
     compileSdkVersion ${compile_sdk}
     buildToolsVersion ${build_tools_version}
+
+    defaultConfig {
+        testPackageName "${sample.package}.test"
+        testInstrumentationRunner "android.test.InstrumentationTestRunner"
+    }
 }
 
 task preflight (dependsOn: parent.preflight) {
diff --git a/templates/create/_MODULE_/tests/src/_PACKAGE_/tests/SampleTests.java.ftl b/templates/create/_MODULE_/src/androidTest/java/_PACKAGE_/test/SampleTests.java.ftl
index 87ee8809..d3552bd0 100644
--- a/templates/create/_MODULE_/tests/src/_PACKAGE_/tests/SampleTests.java.ftl
+++ b/templates/create/_MODULE_/src/androidTest/java/_PACKAGE_/test/SampleTests.java.ftl
@@ -1,5 +1,5 @@
 /*
-* Copyright (C) 2013 The Android Open Source Project
+* Copyright (C) 2014 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.
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package ${sample.package}.tests;
+package ${sample.package}.test;
 
 import ${sample.package}.*;
 
@@ -58,4 +58,4 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity>
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/templates/create/_MODULE_/tests/AndroidManifest.xml.ftl b/templates/create/_MODULE_/tests/AndroidManifest.xml.ftl
deleted file mode 100644
index 87b785fb..00000000
--- a/templates/create/_MODULE_/tests/AndroidManifest.xml.ftl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 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.
-  -->
-<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="${sample.package}.tests"
-          android:versionCode="1"
-          android:versionName="1.0">
-
-    <uses-sdk
-            android:minSdkVersion="18"
-            android:targetSdkVersion="19" />
-
-    <!-- We add an application tag here just so that we can indicate that
-         this package needs to link against the android.test library,
-         which is needed when building test cases. -->
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <!--
-    Specifies the instrumentation test runner used to run the tests.
-    -->
-    <instrumentation
-            android:name="android.test.InstrumentationTestRunner"
-            android:targetPackage="${sample.package}"
-            android:label="Tests for ${sample.package}" />
-
-</manifest>
\ No newline at end of file