aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Walker <jewalker@google.com>2016-04-19 18:35:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-19 18:35:21 +0000
commit8ed9efa9f211b3846a43eddf85f58bf140f0cde2 (patch)
tree5b0c503dbd1427e110fdc7e6b0e5e4de8a3b9765
parent481f9f7a735a96d8be0124b2b2b5841522e96a34 (diff)
parent652241e77df90cf65561078d9934b37bbf78f632 (diff)
downloadandroid-8ed9efa9f211b3846a43eddf85f58bf140f0cde2.tar.gz
Removes BIND_LISTENER from Synchronied Notifications sample.
am: 652241e * commit '652241e77df90cf65561078d9934b37bbf78f632': Removes BIND_LISTENER from Synchronied Notifications sample. Change-Id: I1533328cc7fb6d5a10eba346885d7339140d5834
-rw-r--r--wearable/wear/SynchronizedNotifications/Application/src/main/AndroidManifest.xml6
-rw-r--r--wearable/wear/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml9
-rw-r--r--wearable/wear/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties4
3 files changed, 13 insertions, 6 deletions
diff --git a/wearable/wear/SynchronizedNotifications/Application/src/main/AndroidManifest.xml b/wearable/wear/SynchronizedNotifications/Application/src/main/AndroidManifest.xml
index 04a69e01..b2cba0c9 100644
--- a/wearable/wear/SynchronizedNotifications/Application/src/main/AndroidManifest.xml
+++ b/wearable/wear/SynchronizedNotifications/Application/src/main/AndroidManifest.xml
@@ -42,8 +42,10 @@
</activity>
<service android:name=".DismissListener">
<intent-filter>
- <action
- android:name="com.google.android.gms.wearable.BIND_LISTENER" />
+ <!-- listeners receive events that match the action and data filters -->
+ <action android:name="com.google.android.gms.wearable.DATA_CHANGED" />
+ <!-- filters by Constants.BOTH_PATH ('/both') -->
+ <data android:scheme="wear" android:host="*" android:pathPrefix="/both"/>
</intent-filter>
<intent-filter>
<action
diff --git a/wearable/wear/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml b/wearable/wear/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml
index 5c4d259d..2bc2fd86 100644
--- a/wearable/wear/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml
@@ -41,8 +41,13 @@
</activity>
<service android:name=".NotificationUpdateService">
<intent-filter>
- <action
- android:name="com.google.android.gms.wearable.BIND_LISTENER" />
+ <!-- listeners receive events that match the action and data filters -->
+ <action android:name="com.google.android.gms.wearable.DATA_CHANGED" />
+
+ <!-- filters by Constants.BOTH_PATH ('/both') and
+ Constants.WATCH_ONLY_PATH ('/watch-only') -->
+ <data android:scheme="wear" android:host="*" android:pathPrefix="/both"/>
+ <data android:scheme="wear" android:host="*" android:pathPrefix="/watch-only"/>;
</intent-filter>
<intent-filter>
<action
diff --git a/wearable/wear/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties b/wearable/wear/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties
index 07fc193f..44447c8f 100644
--- a/wearable/wear/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties
+++ b/wearable/wear/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Fri Apr 15 17:18:22 PDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip