aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Walker <jewalker@google.com>2016-04-19 18:35:20 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-19 18:35:20 +0000
commit481f9f7a735a96d8be0124b2b2b5841522e96a34 (patch)
tree744c5df47b639d7d1267790df9a1056236f2c72f
parentd183844208e4e68353aa7eb82b51662fec53c1e8 (diff)
parente223e6c11a106d531b30e7a100a2f3c8bf737676 (diff)
downloadandroid-481f9f7a735a96d8be0124b2b2b5841522e96a34.tar.gz
Removes BIND_LISTENER from XYZTourist.
am: e223e6c * commit 'e223e6c11a106d531b30e7a100a2f3c8bf737676': Removes BIND_LISTENER from XYZTourist. Change-Id: I6225aec814ecb9dcb10860e8c7f6ed64e4cda4f2
-rw-r--r--wearable/wear/XYZTouristAttractions/Application/src/main/AndroidManifest.xml11
-rw-r--r--wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml9
-rw-r--r--wearable/wear/XYZTouristAttractions/gradle/wrapper/gradle-wrapper.properties4
3 files changed, 20 insertions, 4 deletions
diff --git a/wearable/wear/XYZTouristAttractions/Application/src/main/AndroidManifest.xml b/wearable/wear/XYZTouristAttractions/Application/src/main/AndroidManifest.xml
index 9d88b398..762f9cda 100644
--- a/wearable/wear/XYZTouristAttractions/Application/src/main/AndroidManifest.xml
+++ b/wearable/wear/XYZTouristAttractions/Application/src/main/AndroidManifest.xml
@@ -55,7 +55,16 @@
<service android:name=".service.ListenerService">
<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.MESSAGE_RECEIVED" />
+
+ <!-- filters by Constants.CLEAR_NOTIFICATIONS_PATH -->
+ <data android:scheme="wear" android:host="*" android:pathPrefix="/clear"/>
+
+ <!-- filters by Constants.START_PATH, the prefix for
+ Constants.START_ATTRACTION_PATH ('/start/attraction') and
+ Constants.START_NAVIGATION_PATH ('/start/navigation') -->
+ <data android:scheme="wear" android:host="*" android:pathPrefix="/start"/>
</intent-filter>
</service>
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml b/wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml
index d353b290..fc086da1 100644
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml
+++ b/wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml
@@ -44,7 +44,14 @@
<service android:name=".service.ListenerService">
<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.EXTRA_ATTRACTIONS -->
+ <data android:scheme="wear" android:host="*" android:pathPrefix="/attraction"/>
+
+ <action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" />
+ <!-- filters by Constants.CLEAR_NOTIFICATIONS_PATH -->
+ <data android:scheme="wear" android:host="*" android:pathPrefix="/clear"/>
</intent-filter>
</service>
diff --git a/wearable/wear/XYZTouristAttractions/gradle/wrapper/gradle-wrapper.properties b/wearable/wear/XYZTouristAttractions/gradle/wrapper/gradle-wrapper.properties
index 43640279..7eeed2dd 100644
--- a/wearable/wear/XYZTouristAttractions/gradle/wrapper/gradle-wrapper.properties
+++ b/wearable/wear/XYZTouristAttractions/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 22 11:24:44 EST 2014
+#Fri Apr 15 16:13:31 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