From d97ecae3db7b06238e215f6cde15b1bfee658a02 Mon Sep 17 00:00:00 2001 From: anaddaf Date: Fri, 15 Aug 2014 09:46:44 -0700 Subject: [PATCH] Upating the "date" content of notifications to include seconds Including "seconds" in the content of notifications to enables fast creation/update of notifications; previously, the watch-only ones could be created once every minute. Bug: 16898049 Change-Id: Idd7a5b78d4cc948d4c8b3862fd998a91044d6007 --- .../wearable/synchronizednotifications/PhoneActivity.java | 7 ++++--- .../NotificationUpdateService.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/samples/wearable/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/PhoneActivity.java b/samples/wearable/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/PhoneActivity.java index 2cac13751..eb0833491 100644 --- a/samples/wearable/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/PhoneActivity.java +++ b/samples/wearable/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/PhoneActivity.java @@ -34,8 +34,9 @@ import com.google.android.gms.wearable.PutDataMapRequest; import com.google.android.gms.wearable.PutDataRequest; import com.google.android.gms.wearable.Wearable; -import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Locale; /** * A simple activity that presents three buttons that would trigger three different combinations of @@ -165,8 +166,8 @@ public class PhoneActivity extends Activity implements GoogleApiClient.Connectio * Returns a string built from the current time */ private String now() { - DateFormat dateFormat = android.text.format.DateFormat.getTimeFormat(this); - return dateFormat.format(new Date()); + SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss", Locale.getDefault()); + return sdf.format(new Date()); } /** diff --git a/samples/wearable/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/NotificationUpdateService.java b/samples/wearable/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/NotificationUpdateService.java index d701ab142..d57148379 100644 --- a/samples/wearable/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/NotificationUpdateService.java +++ b/samples/wearable/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/NotificationUpdateService.java @@ -107,7 +107,7 @@ public class NotificationUpdateService extends WearableListenerService if (Constants.BOTH_PATH.equals(dataEvent.getDataItem().getUri().getPath())) { // Dismiss the corresponding notification ((NotificationManager) getSystemService(NOTIFICATION_SERVICE)) - .cancel(Constants.BOTH_ID); + .cancel(Constants.WATCH_ONLY_ID); } } }