Part 3 - Updates wear samples for Wear 2.0 launch (fixes minor issues too from using latest support library) . am: 3962962587
am: 401b2f19ff
Change-Id: I17377af7986f4278e89c24abf1e4e2acfa1f5913
diff --git a/wearable/wear/Notifications/Application/src/main/AndroidManifest.xml b/wearable/wear/Notifications/Application/src/main/AndroidManifest.xml
index 6a17ad8..4b0a9b3 100644
--- a/wearable/wear/Notifications/Application/src/main/AndroidManifest.xml
+++ b/wearable/wear/Notifications/Application/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="com.example.android.support.wearable.notifications" >
<uses-sdk android:minSdkVersion="18"
- android:targetSdkVersion="23" />
+ android:targetSdkVersion="25" />
<uses-permission android:name="android.permission.VIBRATE" />
diff --git a/wearable/wear/Notifications/Wearable/src/main/AndroidManifest.xml b/wearable/wear/Notifications/Wearable/src/main/AndroidManifest.xml
index a446fd9..0bce3ea 100644
--- a/wearable/wear/Notifications/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/Notifications/Wearable/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.support.wearable.notifications" >
- <uses-sdk android:minSdkVersion="20"
- android:targetSdkVersion="22" />
+ <uses-sdk android:minSdkVersion="22"
+ android:targetSdkVersion="25" />
<uses-feature android:name="android.hardware.type.watch" />
@@ -28,6 +28,10 @@
android:label="@string/app_name"
android:theme="@android:style/Theme.DeviceDefault.Light" >
+ <meta-data
+ android:name="com.google.android.wearable.standalone"
+ android:value="false" />
+
<activity
android:name=".MainActivity"
android:label="@string/app_name" >
diff --git a/wearable/wear/Notifications/template-params.xml b/wearable/wear/Notifications/template-params.xml
index 64d2e5b..a04ca1a 100644
--- a/wearable/wear/Notifications/template-params.xml
+++ b/wearable/wear/Notifications/template-params.xml
@@ -23,8 +23,8 @@
<package>com.example.android.support.wearable.notifications</package>
<minSdk>18</minSdk>
- <targetSdkVersion>23</targetSdkVersion>
- <targetSdkVersionWear>22</targetSdkVersionWear>
+ <targetSdkVersion>25</targetSdkVersion>
+ <targetSdkVersionWear>25</targetSdkVersionWear>
<wearable>
<has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml b/wearable/wear/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml
index 2bc2fd8..86e8f7a 100644
--- a/wearable/wear/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
package="com.example.android.wearable.synchronizednotifications">
<uses-sdk android:minSdkVersion="20"
- android:targetSdkVersion="22" />
+ android:targetSdkVersion="25" />
<uses-feature android:name="android.hardware.type.watch" />
@@ -29,6 +29,11 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@android:style/Theme.DeviceDefault.Light" >
+
+ <meta-data
+ android:name="com.google.android.wearable.standalone"
+ android:value="false" />
+
<meta-data android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
<activity
diff --git a/wearable/wear/SynchronizedNotifications/template-params.xml b/wearable/wear/SynchronizedNotifications/template-params.xml
index 97c2244..1b3fb75 100644
--- a/wearable/wear/SynchronizedNotifications/template-params.xml
+++ b/wearable/wear/SynchronizedNotifications/template-params.xml
@@ -23,8 +23,8 @@
<package>com.example.android.wearable.synchronizednotifications</package>
<minSdk>18</minSdk>
- <targetSdkVersion>23</targetSdkVersion>
- <targetSdkVersionWear>22</targetSdkVersionWear>
+ <targetSdkVersion>25</targetSdkVersion>
+ <targetSdkVersionWear>25</targetSdkVersionWear>
<wearable>
<has_handheld_app>true</has_handheld_app>
@@ -46,7 +46,7 @@
<common src="activities"/>
<metadata>
- <status>PUBLISHED</status>
+ <status>DEPRECATED</status>
<categories>Wearable</categories>
<technologies>Android</technologies>
<languages>Java</languages>
diff --git a/wearable/wear/WatchViewStub/Wearable/src/main/AndroidManifest.xml b/wearable/wear/WatchViewStub/Wearable/src/main/AndroidManifest.xml
index 774817b..ce1dfc3 100644
--- a/wearable/wear/WatchViewStub/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/WatchViewStub/Wearable/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.google.wearable.watchviewstub" >
- <uses-sdk android:minSdkVersion="20"
- android:targetSdkVersion="22" />
+ <uses-sdk android:minSdkVersion="22"
+ android:targetSdkVersion="25" />
<uses-feature android:name="android.hardware.type.watch" />
@@ -27,6 +27,11 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@android:style/Theme.DeviceDefault">
+
+ <meta-data
+ android:name="com.google.android.wearable.standalone"
+ android:value="true" />
+
<activity
android:name="com.example.android.google.wearable.watchviewstub.MainActivity"
android:label="@string/app_name">
diff --git a/wearable/wear/WatchViewStub/template-params.xml b/wearable/wear/WatchViewStub/template-params.xml
index 39568aa..c11ae78 100644
--- a/wearable/wear/WatchViewStub/template-params.xml
+++ b/wearable/wear/WatchViewStub/template-params.xml
@@ -19,7 +19,7 @@
<group>Wearable</group>
<package>com.example.android.google.wearable.watchviewstub</package>
- <targetSdkVersionWear>22</targetSdkVersionWear>
+ <targetSdkVersionWear>25</targetSdkVersionWear>
<strings>
<intro>
@@ -31,7 +31,7 @@
<template src="base-build"/>
<template src="Wear"/>
<metadata>
- <status>PUBLISHED</status>
+ <status>DEPRECATED</status>
<categories>Wearable</categories>
<technologies>Android</technologies>
<languages>Java</languages>
diff --git a/wearable/wear/WearDrawers/Wearable/build.gradle b/wearable/wear/WearDrawers/Wearable/build.gradle
index 5369310..f8586fb 100644
--- a/wearable/wear/WearDrawers/Wearable/build.gradle
+++ b/wearable/wear/WearDrawers/Wearable/build.gradle
@@ -16,12 +16,13 @@
dependencies {
- provided "com.google.android.wearable:wearable:1.0.0"
- compile 'com.google.android.gms:play-services-wearable:9.4.0'
+ compile 'com.google.android.gms:play-services-wearable:10.0.1'
compile 'com.android.support:support-v13:25.0.1'
- compile 'com.google.android.support:wearable:2.0.0-alpha1'
+ provided 'com.google.android.wearable:wearable:2.0.0'
+
+ compile 'com.google.android.support:wearable:2.0.0'
}
@@ -34,17 +35,17 @@
'template'] // boilerplate code that is generated by the sample template process
android {
- compileSdkVersion 24
+ compileSdkVersion 25
- buildToolsVersion "24.0.2"
+ buildToolsVersion "25.0.2"
defaultConfig {
versionCode 1
versionName "1.0"
- minSdkVersion 23
+ minSdkVersion 24
- targetSdkVersion 23
+ targetSdkVersion 25
}
compileOptions {
diff --git a/wearable/wear/WearDrawers/Wearable/src/main/AndroidManifest.xml b/wearable/wear/WearDrawers/Wearable/src/main/AndroidManifest.xml
index eaf9dbd..fae56dc 100644
--- a/wearable/wear/WearDrawers/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/WearDrawers/Wearable/src/main/AndroidManifest.xml
@@ -13,6 +13,10 @@
android:supportsRtl="true"
android:theme="@android:style/Theme.DeviceDefault">
+ <meta-data
+ android:name="com.google.android.wearable.standalone"
+ android:value="true" />
+
<!--If you want your app to run on pre-22, then set required to false -->
<uses-library android:name="com.google.android.wearable" android:required="false" />
diff --git a/wearable/wear/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java b/wearable/wear/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java
index f2e00c0..4fc2f2f 100644
--- a/wearable/wear/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java
+++ b/wearable/wear/WearDrawers/Wearable/src/main/java/com/example/android/wearable/wear/weardrawers/MainActivity.java
@@ -27,11 +27,10 @@
import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
import android.widget.ImageView;
import android.widget.Toast;
@@ -86,17 +85,22 @@
(WearableNavigationDrawer) findViewById(R.id.top_navigation_drawer);
mWearableNavigationDrawer.setAdapter(new NavigationAdapter(this));
- // Peeks Navigation drawer on the top.
- mWearableDrawerLayout.peekDrawer(Gravity.TOP);
-
// Bottom Action Drawer
mWearableActionDrawer =
(WearableActionDrawer) findViewById(R.id.bottom_action_drawer);
mWearableActionDrawer.setOnMenuItemClickListener(this);
- // Peeks action drawer on the bottom.
- mWearableDrawerLayout.peekDrawer(Gravity.BOTTOM);
+ // Temporarily peeks the navigation and action drawers to ensure the user is aware of them.
+ ViewTreeObserver observer = mWearableDrawerLayout.getViewTreeObserver();
+ observer.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+ @Override
+ public void onGlobalLayout() {
+ mWearableDrawerLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+ mWearableDrawerLayout.peekDrawer(Gravity.TOP);
+ mWearableDrawerLayout.peekDrawer(Gravity.BOTTOM);
+ }
+ });
/* Action Drawer Tip: If you only have a single action for your Action Drawer, you can use a
* (custom) View to peek on top of the content by calling
diff --git a/wearable/wear/WearDrawers/template-params.xml b/wearable/wear/WearDrawers/template-params.xml
index 41c4f0f..01c7fb0 100644
--- a/wearable/wear/WearDrawers/template-params.xml
+++ b/wearable/wear/WearDrawers/template-params.xml
@@ -20,12 +20,8 @@
<group>Wearable</group>
<package>com.example.android.wearable.wear.weardrawers</package>
- <minSdkVersionWear>23</minSdkVersionWear>minSdkVersionWear>
- <targetSdkVersion>23</targetSdkVersion>
- <targetSdkVersionWear>23</targetSdkVersionWear>
-
- <provided_dependency_wearable>com.google.android.wearable:wearable:1.0.0</provided_dependency_wearable>
- <preview_wearable_support_dependency>com.google.android.support:wearable:2.0.0-alpha1</preview_wearable_support_dependency>
+ <targetSdkVersion>25</targetSdkVersion>
+ <targetSdkVersionWear>25</targetSdkVersionWear>
<strings>
<intro>
