am 19e6cdf7: Merge "Updates to WearPlusShared template to get XYZ sample building." into lmp-docsandroid-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-soonglollipop-mr1-dev

* commit '19e6cdf769828142ef7ad17bd785b404080e5807':
  Updates to WearPlusShared template to get XYZ sample building.

4 files changed, 24 insertions, 39 deletions

diff --git a/templates/WearPlusShared/Shared/build.gradle.ftl b/templates/WearPlusShared/Shared/build.gradle.ftl
index 75cc6edc..1a9d842b 100644
--- a/templates/WearPlusShared/Shared/build.gradle.ftl
+++ b/templates/WearPlusShared/Shared/build.gradle.ftl
@@ -15,7 +15,7 @@
 -->
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     dependencies {
@@ -25,6 +25,19 @@ buildscript {
 
 apply plugin: 'android-library'
 
+repositories {
+    jcenter()
+}
+
+<#if sample.dependency_shared?has_content>
+dependencies {
+
+<#list sample.dependency_shared as dep>
+    compile "${dep}"
+</#list>
+
+}</#if>
+
 // The sample build uses multiple directories to
 // keep boilerplate and common code separate from
 // the main sample code.
diff --git a/templates/WearPlusShared/Wearable/build.gradle.ftl b/templates/WearPlusShared/Wearable/build.gradle.ftl
index a47a3762..a625df89 100644
--- a/templates/WearPlusShared/Wearable/build.gradle.ftl
+++ b/templates/WearPlusShared/Wearable/build.gradle.ftl
@@ -15,7 +15,7 @@
 -->
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     dependencies {
@@ -32,6 +32,10 @@ repositories {
 </#list>
 }</#if>
 
+repositories {
+    jcenter()
+}
+
 dependencies {
 
 <#list sample.dependency_wearable as dep>
diff --git a/templates/WearPlusShared/_MODULE_/build.gradle.ftl b/templates/WearPlusShared/_MODULE_/build.gradle.ftl
index 8566b43c..5cb27c50 100644
--- a/templates/WearPlusShared/_MODULE_/build.gradle.ftl
+++ b/templates/WearPlusShared/_MODULE_/build.gradle.ftl
@@ -15,7 +15,7 @@
 -->
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     dependencies {
@@ -33,6 +33,10 @@ repositories {
 }
 </#if>
 
+repositories {
+    jcenter()
+}
+
 dependencies {
 
 <#list sample.dependency as dep>
diff --git a/templates/base/_MODULE_/src/template/res/layout/activity_main.xml b/templates/base/_MODULE_/src/template/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49d..00000000
--- a/templates/base/_MODULE_/src/template/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>