Updating samples that should not have the Application modules
Updated templates-params.xml and settings.gradle to reflect that they
don't need to have Applications (i.e. hand-held component). In
addition, removed the Application directory for those samples.
Change-Id: I8aee85e29509d6635f6c3615d94008ab3e70f4a0
diff --git a/wearable/wear/GridViewPager/Application/.gitignore b/wearable/wear/GridViewPager/Application/.gitignore
deleted file mode 100644
index 6eb878d..0000000
--- a/wearable/wear/GridViewPager/Application/.gitignore
+++ /dev/null
@@ -1,16 +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.
-src/template/
-src/common/
-build.gradle
diff --git a/wearable/wear/GridViewPager/Application/proguard-project.txt b/wearable/wear/GridViewPager/Application/proguard-project.txt
deleted file mode 100644
index 0d8f171..0000000
--- a/wearable/wear/GridViewPager/Application/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
- To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/wearable/wear/GridViewPager/Application/src/main/AndroidManifest.xml b/wearable/wear/GridViewPager/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index b6092c5..0000000
--- a/wearable/wear/GridViewPager/Application/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 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.
- 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.wearable.gridviewpager">
-
- <uses-sdk android:minSdkVersion="18"
- android:targetSdkVersion="21" />
-
- <application android:allowBackup="true"
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name">
- </application>
-
-</manifest>
-
diff --git a/wearable/wear/GridViewPager/Application/src/main/res/drawable-hdpi/ic_launcher.png b/wearable/wear/GridViewPager/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100755
index 589f229..0000000
--- a/wearable/wear/GridViewPager/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/GridViewPager/Application/src/main/res/drawable-mdpi/ic_launcher.png b/wearable/wear/GridViewPager/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100755
index 77dd571..0000000
--- a/wearable/wear/GridViewPager/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/GridViewPager/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/wearable/wear/GridViewPager/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100755
index fe34ebe..0000000
--- a/wearable/wear/GridViewPager/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/GridViewPager/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/wearable/wear/GridViewPager/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100755
index ab80bcd..0000000
--- a/wearable/wear/GridViewPager/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/GridViewPager/settings.gradle b/wearable/wear/GridViewPager/settings.gradle
index 19d00ac..1d97d30 100644
--- a/wearable/wear/GridViewPager/settings.gradle
+++ b/wearable/wear/GridViewPager/settings.gradle
@@ -1 +1 @@
-include ':Application', ':Wearable'
+include ':Wearable'
diff --git a/wearable/wear/GridViewPager/template-params.xml b/wearable/wear/GridViewPager/template-params.xml
index c3d374d..1aa4523 100644
--- a/wearable/wear/GridViewPager/template-params.xml
+++ b/wearable/wear/GridViewPager/template-params.xml
@@ -24,10 +24,6 @@
<minSdk>18</minSdk>
- <wearable>
- <has_handheld_app>true</has_handheld_app>
- </wearable>
-
<strings>
<intro>
<![CDATA[
@@ -36,7 +32,7 @@
</intro>
</strings>
- <template src="base"/>
+ <template src="base-build"/>
<template src="Wear"/>
</sample>
diff --git a/wearable/wear/JumpingJack/Application/.gitignore b/wearable/wear/JumpingJack/Application/.gitignore
deleted file mode 100644
index 6eb878d..0000000
--- a/wearable/wear/JumpingJack/Application/.gitignore
+++ /dev/null
@@ -1,16 +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.
-src/template/
-src/common/
-build.gradle
diff --git a/wearable/wear/JumpingJack/Application/proguard-project.txt b/wearable/wear/JumpingJack/Application/proguard-project.txt
deleted file mode 100644
index 0d8f171..0000000
--- a/wearable/wear/JumpingJack/Application/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
- To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/wearable/wear/JumpingJack/Application/src/main/AndroidManifest.xml b/wearable/wear/JumpingJack/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 8605fb0..0000000
--- a/wearable/wear/JumpingJack/Application/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 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.
- 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.wearable.jumpingjack">
-
- <uses-sdk android:minSdkVersion="18"
- android:targetSdkVersion="21" />
- <uses-permission android:name="android.permission.VIBRATE"/>
-
- <application android:allowBackup="true"
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name">
- </application>
-
-</manifest>
-
diff --git a/wearable/wear/JumpingJack/Application/src/main/res/drawable-hdpi/ic_launcher.png b/wearable/wear/JumpingJack/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100755
index 589f229..0000000
--- a/wearable/wear/JumpingJack/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/JumpingJack/Application/src/main/res/drawable-mdpi/ic_launcher.png b/wearable/wear/JumpingJack/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100755
index 77dd571..0000000
--- a/wearable/wear/JumpingJack/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/JumpingJack/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/wearable/wear/JumpingJack/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100755
index fe34ebe..0000000
--- a/wearable/wear/JumpingJack/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/JumpingJack/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/wearable/wear/JumpingJack/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index ab80bcd..0000000
--- a/wearable/wear/JumpingJack/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/JumpingJack/settings.gradle b/wearable/wear/JumpingJack/settings.gradle
index 19d00ac..1d97d30 100644
--- a/wearable/wear/JumpingJack/settings.gradle
+++ b/wearable/wear/JumpingJack/settings.gradle
@@ -1 +1 @@
-include ':Application', ':Wearable'
+include ':Wearable'
diff --git a/wearable/wear/JumpingJack/template-params.xml b/wearable/wear/JumpingJack/template-params.xml
index 8548c6b..96ce475 100644
--- a/wearable/wear/JumpingJack/template-params.xml
+++ b/wearable/wear/JumpingJack/template-params.xml
@@ -24,10 +24,6 @@
<minSdk>18</minSdk>
- <wearable>
- <has_handheld_app>true</has_handheld_app>
- </wearable>
-
<strings>
<intro>
<![CDATA[
@@ -36,7 +32,7 @@
</intro>
</strings>
- <template src="base"/>
+ <template src="base-build"/>
<template src="Wear"/>
<common src="logger"/>
<common src="activities"/>
diff --git a/wearable/wear/SkeletonWearableApp/Application/.gitignore b/wearable/wear/SkeletonWearableApp/Application/.gitignore
deleted file mode 100644
index 6eb878d..0000000
--- a/wearable/wear/SkeletonWearableApp/Application/.gitignore
+++ /dev/null
@@ -1,16 +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.
-src/template/
-src/common/
-build.gradle
diff --git a/wearable/wear/SkeletonWearableApp/Application/proguard-project.txt b/wearable/wear/SkeletonWearableApp/Application/proguard-project.txt
deleted file mode 100644
index 0d8f171..0000000
--- a/wearable/wear/SkeletonWearableApp/Application/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
- To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/wearable/wear/SkeletonWearableApp/Application/src/main/AndroidManifest.xml b/wearable/wear/SkeletonWearableApp/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 23497ca..0000000
--- a/wearable/wear/SkeletonWearableApp/Application/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 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.
- 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.google.wearable.app">
-
- <uses-sdk android:minSdkVersion="18"
- android:targetSdkVersion="21" />
-
- <application android:allowBackup="true"
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name">
- </application>
-
-</manifest>
-
diff --git a/wearable/wear/SkeletonWearableApp/Application/src/main/res/drawable-hdpi/ic_launcher.png b/wearable/wear/SkeletonWearableApp/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100755
index 589f229..0000000
--- a/wearable/wear/SkeletonWearableApp/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/SkeletonWearableApp/Application/src/main/res/drawable-mdpi/ic_launcher.png b/wearable/wear/SkeletonWearableApp/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100755
index 77dd571..0000000
--- a/wearable/wear/SkeletonWearableApp/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/SkeletonWearableApp/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/wearable/wear/SkeletonWearableApp/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100755
index fe34ebe..0000000
--- a/wearable/wear/SkeletonWearableApp/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/SkeletonWearableApp/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/wearable/wear/SkeletonWearableApp/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100755
index ab80bcd..0000000
--- a/wearable/wear/SkeletonWearableApp/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/SkeletonWearableApp/settings.gradle b/wearable/wear/SkeletonWearableApp/settings.gradle
index 19d00ac..1d97d30 100644
--- a/wearable/wear/SkeletonWearableApp/settings.gradle
+++ b/wearable/wear/SkeletonWearableApp/settings.gradle
@@ -1 +1 @@
-include ':Application', ':Wearable'
+include ':Wearable'
diff --git a/wearable/wear/SkeletonWearableApp/template-params.xml b/wearable/wear/SkeletonWearableApp/template-params.xml
index a5c2056..c8527c4 100644
--- a/wearable/wear/SkeletonWearableApp/template-params.xml
+++ b/wearable/wear/SkeletonWearableApp/template-params.xml
@@ -21,10 +21,6 @@
<minSdk>18</minSdk>
- <wearable>
- <has_handheld_app>true</has_handheld_app>
- </wearable>
-
<strings>
<intro>
<![CDATA[
@@ -35,7 +31,7 @@
]]>
</intro>
</strings>
- <template src="base"/>
+ <template src="base-build"/>
<template src="Wear"/>
<metadata>
<status>PUBLISHED</status>
diff --git a/wearable/wear/Timer/Application/.gitignore b/wearable/wear/Timer/Application/.gitignore
deleted file mode 100644
index 6eb878d..0000000
--- a/wearable/wear/Timer/Application/.gitignore
+++ /dev/null
@@ -1,16 +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.
-src/template/
-src/common/
-build.gradle
diff --git a/wearable/wear/Timer/Application/proguard-project.txt b/wearable/wear/Timer/Application/proguard-project.txt
deleted file mode 100644
index 0d8f171..0000000
--- a/wearable/wear/Timer/Application/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
- To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/wearable/wear/Timer/Application/src/main/AndroidManifest.xml b/wearable/wear/Timer/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 2c60ab9..0000000
--- a/wearable/wear/Timer/Application/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 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.
- 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.wearable.timer">
-
- <uses-sdk android:minSdkVersion="18"
- android:targetSdkVersion="21" />
-
- <application android:allowBackup="true"
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name">
- </application>
-
-</manifest>
-
diff --git a/wearable/wear/Timer/Application/src/main/res/drawable-hdpi/ic_launcher.png b/wearable/wear/Timer/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100755
index 589f229..0000000
--- a/wearable/wear/Timer/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/Timer/Application/src/main/res/drawable-mdpi/ic_launcher.png b/wearable/wear/Timer/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100755
index 77dd571..0000000
--- a/wearable/wear/Timer/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/Timer/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/wearable/wear/Timer/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100755
index fe34ebe..0000000
--- a/wearable/wear/Timer/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/Timer/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/wearable/wear/Timer/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100755
index ab80bcd..0000000
--- a/wearable/wear/Timer/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/Timer/settings.gradle b/wearable/wear/Timer/settings.gradle
index 19d00ac..1d97d30 100644
--- a/wearable/wear/Timer/settings.gradle
+++ b/wearable/wear/Timer/settings.gradle
@@ -1 +1 @@
-include ':Application', ':Wearable'
+include ':Wearable'
diff --git a/wearable/wear/Timer/template-params.xml b/wearable/wear/Timer/template-params.xml
index 8414f70..507b0a2 100644
--- a/wearable/wear/Timer/template-params.xml
+++ b/wearable/wear/Timer/template-params.xml
@@ -24,10 +24,6 @@
<minSdk>18</minSdk>
- <wearable>
- <has_handheld_app>true</has_handheld_app>
- </wearable>
-
<strings>
<intro>
<![CDATA[
@@ -37,7 +33,7 @@
</intro>
</strings>
- <template src="base"/>
+ <template src="base-build"/>
<template src="Wear"/>
</sample>
diff --git a/wearable/wear/WatchViewStub/Application/.gitignore b/wearable/wear/WatchViewStub/Application/.gitignore
deleted file mode 100644
index 6eb878d..0000000
--- a/wearable/wear/WatchViewStub/Application/.gitignore
+++ /dev/null
@@ -1,16 +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.
-src/template/
-src/common/
-build.gradle
diff --git a/wearable/wear/WatchViewStub/Application/proguard-project.txt b/wearable/wear/WatchViewStub/Application/proguard-project.txt
deleted file mode 100644
index 0d8f171..0000000
--- a/wearable/wear/WatchViewStub/Application/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
- To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/wearable/wear/WatchViewStub/Application/src/main/AndroidManifest.xml b/wearable/wear/WatchViewStub/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index b1b7103..0000000
--- a/wearable/wear/WatchViewStub/Application/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 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.
- 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.google.wearable.watchviewstub">
-
- <uses-sdk android:minSdkVersion="18"
- android:targetSdkVersion="21" />
-
- <application android:allowBackup="true"
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name">
- </application>
-
-</manifest>
-
diff --git a/wearable/wear/WatchViewStub/Application/src/main/res/drawable-hdpi/ic_launcher.png b/wearable/wear/WatchViewStub/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100755
index 589f229..0000000
--- a/wearable/wear/WatchViewStub/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/WatchViewStub/Application/src/main/res/drawable-mdpi/ic_launcher.png b/wearable/wear/WatchViewStub/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100755
index 77dd571..0000000
--- a/wearable/wear/WatchViewStub/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/WatchViewStub/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/wearable/wear/WatchViewStub/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100755
index fe34ebe..0000000
--- a/wearable/wear/WatchViewStub/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/WatchViewStub/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/wearable/wear/WatchViewStub/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100755
index ab80bcd..0000000
--- a/wearable/wear/WatchViewStub/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/wearable/wear/WatchViewStub/settings.gradle b/wearable/wear/WatchViewStub/settings.gradle
index 19d00ac..1d97d30 100644
--- a/wearable/wear/WatchViewStub/settings.gradle
+++ b/wearable/wear/WatchViewStub/settings.gradle
@@ -1 +1 @@
-include ':Application', ':Wearable'
+include ':Wearable'
diff --git a/wearable/wear/WatchViewStub/template-params.xml b/wearable/wear/WatchViewStub/template-params.xml
index 1637cbb..e06543a 100644
--- a/wearable/wear/WatchViewStub/template-params.xml
+++ b/wearable/wear/WatchViewStub/template-params.xml
@@ -21,10 +21,6 @@
<minSdk>18</minSdk>
- <wearable>
- <has_handheld_app>true</has_handheld_app>
- </wearable>
-
<strings>
<intro>
<![CDATA[
@@ -32,7 +28,7 @@
]]>
</intro>
</strings>
- <template src="base"/>
+ <template src="base-build"/>
<template src="Wear"/>
<metadata>
<status>PUBLISHED</status>
