Add setUrgent call for DataLayer changes in GMS core.

Change-Id: I4dce4df608e9fb4e1902505eecf23b8f14096e3c

16 files changed, 35 insertions, 17 deletions

diff --git a/wearable/wear/AgendaData/Application/src/main/java/com/example/android/wearable/agendadata/CalendarQueryService.java b/wearable/wear/AgendaData/Application/src/main/java/com/example/android/wearable/agendadata/CalendarQueryService.java
index c39a5ed1..7a379aa8 100644
--- a/wearable/wear/AgendaData/Application/src/main/java/com/example/android/wearable/agendadata/CalendarQueryService.java
+++ b/wearable/wear/AgendaData/Application/src/main/java/com/example/android/wearable/agendadata/CalendarQueryService.java
@@ -250,6 +250,7 @@ public class CalendarQueryService extends IntentService
         public PutDataMapRequest toPutDataMapRequest(){
             final PutDataMapRequest putDataMapRequest = PutDataMapRequest.create(
                     makeDataItemPath(eventId, begin));
+            putDataMapRequest.setUrgent();
             DataMap data = putDataMapRequest.getDataMap();
             data.putString(DATA_ITEM_URI, putDataMapRequest.getUri().toString());
             data.putLong(ID, id);
diff --git a/wearable/wear/DataLayer/Application/src/main/java/com/example/android/wearable/datalayer/MainActivity.java b/wearable/wear/DataLayer/Application/src/main/java/com/example/android/wearable/datalayer/MainActivity.java
index 1c67c0e0..e559db68 100644
--- a/wearable/wear/DataLayer/Application/src/main/java/com/example/android/wearable/datalayer/MainActivity.java
+++ b/wearable/wear/DataLayer/Application/src/main/java/com/example/android/wearable/datalayer/MainActivity.java
@@ -381,7 +381,9 @@ public class MainActivity extends Activity implements DataApi.DataListener,
         public void run() {
             PutDataMapRequest putDataMapRequest = PutDataMapRequest.create(COUNT_PATH);
             putDataMapRequest.getDataMap().putInt(COUNT_KEY, count++);
+            putDataMapRequest.setUrgent();
             PutDataRequest request = putDataMapRequest.asPutDataRequest();
+            request.setUrgent();
 
             LOGD(TAG, "Generating DataItem: " + request);
             if (!mGoogleApiClient.isConnected()) {
@@ -442,6 +444,8 @@ public class MainActivity extends Activity implements DataApi.DataListener,
         dataMap.getDataMap().putAsset(IMAGE_KEY, asset);
         dataMap.getDataMap().putLong("time", new Date().getTime());
         PutDataRequest request = dataMap.asPutDataRequest();
+        request.setUrgent();
+
         Wearable.DataApi.putDataItem(mGoogleApiClient, request)
                 .setResultCallback(new ResultCallback<DataItemResult>() {
                     @Override
diff --git a/wearable/wear/FindMyPhone/Wearable/src/main/java/com/example/android/wearable/findphone/FindPhoneService.java b/wearable/wear/FindMyPhone/Wearable/src/main/java/com/example/android/wearable/findphone/FindPhoneService.java
index c6c6d67b..a51a9b20 100644
--- a/wearable/wear/FindMyPhone/Wearable/src/main/java/com/example/android/wearable/findphone/FindPhoneService.java
+++ b/wearable/wear/FindMyPhone/Wearable/src/main/java/com/example/android/wearable/findphone/FindPhoneService.java
@@ -100,6 +100,7 @@ public class FindPhoneService extends IntentService implements GoogleApiClient.C
             // when it receives the change.
             PutDataMapRequest putDataMapRequest = PutDataMapRequest.create(PATH_SOUND_ALARM);
             putDataMapRequest.getDataMap().putBoolean(FIELD_ALARM_ON, alarmOn);
+            putDataMapRequest.setUrgent();
             Wearable.DataApi.putDataItem(mGoogleApiClient, putDataMapRequest.asPutDataRequest())
                     .await();
         } else {
diff --git a/wearable/wear/Geofencing/Application/src/main/java/com/example/android/wearable/geofencing/GeofenceTransitionsIntentService.java b/wearable/wear/Geofencing/Application/src/main/java/com/example/android/wearable/geofencing/GeofenceTransitionsIntentService.java
index 53117e3a..e3f61392 100644
--- a/wearable/wear/Geofencing/Application/src/main/java/com/example/android/wearable/geofencing/GeofenceTransitionsIntentService.java
+++ b/wearable/wear/Geofencing/Application/src/main/java/com/example/android/wearable/geofencing/GeofenceTransitionsIntentService.java
@@ -89,6 +89,7 @@ public class GeofenceTransitionsIntentService extends IntentService
                 final PutDataMapRequest putDataMapRequest =
                         PutDataMapRequest.create(GEOFENCE_DATA_ITEM_PATH);
                 putDataMapRequest.getDataMap().putString(KEY_GEOFENCE_ID, triggeredGeoFenceId);
+                putDataMapRequest.setUrgent();
                 if (mGoogleApiClient.isConnected()) {
                     Wearable.DataApi.putDataItem(
                             mGoogleApiClient, putDataMapRequest.asPutDataRequest()).await();
diff --git a/wearable/wear/Geofencing/template-params.xml b/wearable/wear/Geofencing/template-params.xml
index a69c82c6..cd576131 100644
--- a/wearable/wear/Geofencing/template-params.xml
+++ b/wearable/wear/Geofencing/template-params.xml
@@ -26,7 +26,7 @@
     <targetSdkVersion>22</targetSdkVersion>
     <targetSdkVersionWear>22</targetSdkVersionWear>
 
-    <dependency>com.google.android.gms:play-services-location:8.1.0</dependency>
+    <dependency>com.google.android.gms:play-services-location:8.3.0</dependency>
 
     <wearable>
         <has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/Quiz/Application/src/main/java/com/example/android/wearable/quiz/MainActivity.java b/wearable/wear/Quiz/Application/src/main/java/com/example/android/wearable/quiz/MainActivity.java
index de8eb745..d1e2d739 100644
--- a/wearable/wear/Quiz/Application/src/main/java/com/example/android/wearable/quiz/MainActivity.java
+++ b/wearable/wear/Quiz/Application/src/main/java/com/example/android/wearable/quiz/MainActivity.java
@@ -248,7 +248,9 @@ public class MainActivity extends Activity implements DataApi.DataListener,
             dataMap.putInt(QUESTION_INDEX, questionIndex);
             dataMap.putStringArray(ANSWERS, answers);
             dataMap.putInt(CORRECT_ANSWER_INDEX, correctAnswerIndex);
-            return request.asPutDataRequest();
+            PutDataRequest putDataRequest = request.asPutDataRequest();
+            putDataRequest.setUrgent();
+            return putDataRequest;
         }
     }
 
@@ -496,7 +498,10 @@ public class MainActivity extends Activity implements DataApi.DataListener,
                 dataMap.putBoolean(QUESTION_WAS_DELETED, false);
                 if (!mHasQuestionBeenAsked && dataMap.getInt(QUESTION_INDEX) == 0) {
                     // Ask the first question now.
-                    Wearable.DataApi.putDataItem(mGoogleApiClient, request.asPutDataRequest());
+                    PutDataRequest putDataRequest = request.asPutDataRequest();
+                    // Set to high priority in case it isn't already.
+                    putDataRequest.setUrgent();
+                    Wearable.DataApi.putDataItem(mGoogleApiClient, putDataRequest);
                     setHasQuestionBeenAsked(true);
                 } else {
                     // Enqueue future questions.
diff --git a/wearable/wear/Quiz/Wearable/src/main/java/com/example/android/wearable/quiz/DeleteQuestionService.java b/wearable/wear/Quiz/Wearable/src/main/java/com/example/android/wearable/quiz/DeleteQuestionService.java
index 353903cd..d7154110 100644
--- a/wearable/wear/Quiz/Wearable/src/main/java/com/example/android/wearable/quiz/DeleteQuestionService.java
+++ b/wearable/wear/Quiz/Wearable/src/main/java/com/example/android/wearable/quiz/DeleteQuestionService.java
@@ -76,6 +76,7 @@ public class DeleteQuestionService extends IntentService
         DataMap dataMap = putDataMapRequest.getDataMap();
         dataMap.putBoolean(QUESTION_WAS_DELETED, true);
         PutDataRequest request = putDataMapRequest.asPutDataRequest();
+        request.setUrgent();
         Wearable.DataApi.putDataItem(mGoogleApiClient, request).await();
         mGoogleApiClient.disconnect();
     }
diff --git a/wearable/wear/Quiz/Wearable/src/main/java/com/example/android/wearable/quiz/UpdateQuestionService.java b/wearable/wear/Quiz/Wearable/src/main/java/com/example/android/wearable/quiz/UpdateQuestionService.java
index 7b8f730c..50425b03 100644
--- a/wearable/wear/Quiz/Wearable/src/main/java/com/example/android/wearable/quiz/UpdateQuestionService.java
+++ b/wearable/wear/Quiz/Wearable/src/main/java/com/example/android/wearable/quiz/UpdateQuestionService.java
@@ -88,6 +88,7 @@ public class UpdateQuestionService extends IntentService
         dataMap.putBoolean(CHOSEN_ANSWER_CORRECT, chosenAnswerCorrect);
         dataMap.putBoolean(QUESTION_WAS_ANSWERED, true);
         PutDataRequest request = putDataMapRequest.asPutDataRequest();
+        request.setUrgent();
         Wearable.DataApi.putDataItem(mGoogleApiClient, request).await();
 
         // Remove this question notification.
diff --git a/wearable/wear/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java b/wearable/wear/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java
index ee3c3ef9..25f424ca 100644
--- a/wearable/wear/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java
+++ b/wearable/wear/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java
@@ -408,6 +408,7 @@ public class WearableMainActivity extends WearableActivity implements
         putDataMapRequest.getDataMap()
                 .putLong(Constants.KEY_TIME, entry.calendar.getTimeInMillis());
         PutDataRequest request = putDataMapRequest.asPutDataRequest();
+        request.setUrgent();
         Wearable.DataApi.putDataItem(mGoogleApiClient, request)
                 .setResultCallback(new ResultCallback<DataApi.DataItemResult>() {
                     @Override
diff --git a/wearable/wear/SpeedTracker/template-params.xml b/wearable/wear/SpeedTracker/template-params.xml
index 8730de13..0817916d 100644
--- a/wearable/wear/SpeedTracker/template-params.xml
+++ b/wearable/wear/SpeedTracker/template-params.xml
@@ -32,8 +32,8 @@
 
     <dependency>com.android.support:design:23.0.1</dependency>
 
-    <dependency>com.google.android.gms:play-services-location:8.1.0</dependency>
-    <dependency_wearable>com.google.android.gms:play-services-location:8.1.0</dependency_wearable>
+    <dependency>com.google.android.gms:play-services-location:8.3.0</dependency>
+    <dependency_wearable>com.google.android.gms:play-services-location:8.3.0</dependency_wearable>
 
     <strings>
         <intro>
diff --git a/wearable/wear/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/DismissListener.java b/wearable/wear/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/DismissListener.java
index 8d5cca44..46218794 100644
--- a/wearable/wear/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/DismissListener.java
+++ b/wearable/wear/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/DismissListener.java
@@ -31,7 +31,6 @@ import com.google.android.gms.common.api.ResultCallback;
 import com.google.android.gms.wearable.DataApi;
 import com.google.android.gms.wearable.DataEvent;
 import com.google.android.gms.wearable.DataEventBuffer;
-import com.google.android.gms.wearable.PutDataMapRequest;
 import com.google.android.gms.wearable.Wearable;
 import com.google.android.gms.wearable.WearableListenerService;
 
diff --git a/wearable/wear/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/SynchronizedNotificationsFragment.java b/wearable/wear/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/SynchronizedNotificationsFragment.java
index 240af9b2..837c7ad2 100644
--- a/wearable/wear/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/SynchronizedNotificationsFragment.java
+++ b/wearable/wear/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/SynchronizedNotificationsFragment.java
@@ -19,17 +19,11 @@ package com.example.android.wearable.synchronizednotifications;
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.support.v4.app.Fragment;
-import android.app.Activity;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationManagerCompat;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Toast;
 
 import com.example.android.wearable.synchronizednotifications.common.Constants;
 import com.google.android.gms.common.ConnectionResult;
@@ -61,7 +55,7 @@ import java.util.Locale;
 public class SynchronizedNotificationsFragment extends Fragment
         implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
 
-    private static final String TAG = "SynchronizedNotificationsFragment";
+    private static final String TAG = "SynchronizedFragment";
     private GoogleApiClient mGoogleApiClient;
 
     @Override
@@ -87,7 +81,8 @@ public class SynchronizedNotificationsFragment extends Fragment
                         Constants.WATCH_ONLY_PATH);
                 return true;
             case R.id.btn_different:
-                buildMirroredNotifications(getString(R.string.phone_both), getString(R.string.watch_both), now());
+                buildMirroredNotifications(
+                        getString(R.string.phone_both), getString(R.string.watch_both), now());
                 return true;
         }
         return false;
@@ -110,8 +105,12 @@ public class SynchronizedNotificationsFragment extends Fragment
         if (withDismissal) {
             Intent dismissIntent = new Intent(Constants.ACTION_DISMISS);
             dismissIntent.putExtra(Constants.KEY_NOTIFICATION_ID, Constants.BOTH_ID);
-            PendingIntent pendingIntent = PendingIntent
-                    .getService(this.getActivity(), 0, dismissIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+            PendingIntent pendingIntent =
+                    PendingIntent.getService(
+                            this.getActivity(),
+                            0,
+                            dismissIntent,
+                            PendingIntent.FLAG_UPDATE_CURRENT);
             builder.setDeleteIntent(pendingIntent);
         }
         NotificationManagerCompat.from(this.getActivity()).notify(notificationId, builder.build());
@@ -127,6 +126,7 @@ public class SynchronizedNotificationsFragment extends Fragment
             putDataMapRequest.getDataMap().putString(Constants.KEY_CONTENT, content);
             putDataMapRequest.getDataMap().putString(Constants.KEY_TITLE, title);
             PutDataRequest request = putDataMapRequest.asPutDataRequest();
+            request.setUrgent();
             Wearable.DataApi.putDataItem(mGoogleApiClient, request)
                     .setResultCallback(new ResultCallback<DataApi.DataItemResult>() {
                         @Override
diff --git a/wearable/wear/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/NotificationUpdateService.java b/wearable/wear/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/NotificationUpdateService.java
index 8b46bf3a..b5040d4d 100644
--- a/wearable/wear/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/NotificationUpdateService.java
+++ b/wearable/wear/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/NotificationUpdateService.java
@@ -35,7 +35,6 @@ import com.google.android.gms.wearable.DataEvent;
 import com.google.android.gms.wearable.DataEventBuffer;
 import com.google.android.gms.wearable.DataMap;
 import com.google.android.gms.wearable.DataMapItem;
-import com.google.android.gms.wearable.PutDataMapRequest;
 import com.google.android.gms.wearable.Wearable;
 import com.google.android.gms.wearable.WearableListenerService;
 
diff --git a/wearable/wear/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/WearableActivity.java b/wearable/wear/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/WearableActivity.java
index 6ef2f1bd..9d1eff45 100644
--- a/wearable/wear/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/WearableActivity.java
+++ b/wearable/wear/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/WearableActivity.java
@@ -18,6 +18,9 @@ package com.example.android.wearable.synchronizednotifications;
 import android.app.Activity;
 import android.os.Bundle;
 
+/**
+ * Empty Activity.
+ */
 public class WearableActivity extends Activity {
 
     @Override
diff --git a/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/DigitalWatchFaceUtil.java b/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/DigitalWatchFaceUtil.java
index 1c4af700..e13440d2 100644
--- a/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/DigitalWatchFaceUtil.java
+++ b/wearable/wear/WatchFace/Wearable/src/main/java/com/example/android/wearable/watchface/DigitalWatchFaceUtil.java
@@ -165,6 +165,7 @@ public final class DigitalWatchFaceUtil {
      */
     public static void putConfigDataItem(GoogleApiClient googleApiClient, DataMap newConfig) {
         PutDataMapRequest putDataMapRequest = PutDataMapRequest.create(PATH_WITH_FEATURE);
+        putDataMapRequest.setUrgent();
         DataMap configToPut = putDataMapRequest.getDataMap();
         configToPut.putAll(newConfig);
         Wearable.DataApi.putDataItem(googleApiClient, putDataMapRequest.asPutDataRequest())
diff --git a/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java b/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java
index 48bad2c6..3122d567 100644
--- a/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java
+++ b/wearable/wear/XYZTouristAttractions/Application/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java
@@ -476,6 +476,7 @@ public class UtilityService extends IntentService {
             dataMap.getDataMap().putDataMapArrayList(Constants.EXTRA_ATTRACTIONS, attractionsData);
             dataMap.getDataMap().putLong(Constants.EXTRA_TIMESTAMP, new Date().getTime());
             PutDataRequest request = dataMap.asPutDataRequest();
+            request.setUrgent();
 
             // Send the data over
             DataApi.DataItemResult result =