diff --git a/res/drawable/ic_wear_read.xml b/res/drawable/ic_wear_read.xml deleted file mode 100644 index 9d017e6..0000000 --- a/res/drawable/ic_wear_read.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/values/strings.xml b/res/values/strings.xml index de956b7..70e567f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -236,8 +236,6 @@ New message %d new messages - - Mark as read Start diff --git a/src/com/android/messaging/datamodel/BugleNotifications.java b/src/com/android/messaging/datamodel/BugleNotifications.java index 9b96c6e..3faee85 100644 --- a/src/com/android/messaging/datamodel/BugleNotifications.java +++ b/src/com/android/messaging/datamodel/BugleNotifications.java @@ -833,8 +833,7 @@ public class BugleNotifications { maybeAddWearableConversationLog(wearableExtender, (MultiMessageNotificationState) notificationState); addDownloadMmsAction(notifBuilder, wearableExtender, notificationState); - addReplyAction(notifBuilder, wearableExtender, notificationState); - addReadAction(notifBuilder, wearableExtender, notificationState); + addWearableVoiceReplyAction(wearableExtender, notificationState); } // Apply the wearable options and build & post the notification @@ -876,7 +875,7 @@ public class BugleNotifications { } } - private static void addReplyAction(final NotificationCompat.Builder notifBuilder, + private static void addWearableVoiceReplyAction( final WearableExtender wearableExtender, final NotificationState notificationState) { if (!(notificationState instanceof MultiMessageNotificationState)) { return; @@ -913,25 +912,9 @@ public class BugleNotifications { setChoices(choices) .build(); actionBuilder.addRemoteInput(remoteInput); - notifBuilder.addAction(actionBuilder.build()); - - // Support the action on a wearable device as well wearableExtender.addAction(actionBuilder.build()); } - private static void addReadAction(final NotificationCompat.Builder notifBuilder, - final WearableExtender wearableExtender, final NotificationState notificationState) { - final Context context = Factory.get().getApplicationContext(); - final PendingIntent readPendingIntent = notificationState.getReadIntent(); - final NotificationCompat.Action.Builder readActionBuilder = - new NotificationCompat.Action.Builder(R.drawable.ic_wear_read, - context.getString(R.string.notification_mark_as_read), readPendingIntent); - notifBuilder.addAction(readActionBuilder.build()); - - // Support the action on a wearable device as well - wearableExtender.addAction(readActionBuilder.build()); - } - private static void addDownloadMmsAction(final NotificationCompat.Builder notifBuilder, final WearableExtender wearableExtender, final NotificationState notificationState) { if (!(notificationState instanceof MultiMessageNotificationState)) { diff --git a/src/com/android/messaging/datamodel/MessageNotificationState.java b/src/com/android/messaging/datamodel/MessageNotificationState.java index f0e8364..6b858fa 100644 --- a/src/com/android/messaging/datamodel/MessageNotificationState.java +++ b/src/com/android/messaging/datamodel/MessageNotificationState.java @@ -349,14 +349,6 @@ public abstract class MessageNotificationState extends NotificationState { getClearIntentRequestCode()); } - @Override - public PendingIntent getReadIntent() { - return UIIntents.get().getPendingIntentForMarkingAsRead( - Factory.get().getApplicationContext(), - mConversationIds, - getReadIntentRequestCode()); - } - /** * Notification for multiple messages in at least 2 different conversations. */ diff --git a/src/com/android/messaging/datamodel/NotificationState.java b/src/com/android/messaging/datamodel/NotificationState.java index 576a692..e19f70c 100644 --- a/src/com/android/messaging/datamodel/NotificationState.java +++ b/src/com/android/messaging/datamodel/NotificationState.java @@ -43,8 +43,7 @@ import java.util.HashSet; public abstract class NotificationState { private static final int CONTENT_INTENT_REQUEST_CODE_OFFSET = 0; private static final int CLEAR_INTENT_REQUEST_CODE_OFFSET = 1; - private static final int READ_INTENT_REQUEST_CODE_OFFSET = 2; - private static final int NUM_REQUEST_CODES_NEEDED = 3; + private static final int NUM_REQUEST_CODES_NEEDED = 2; public interface FailedMessageQuery { static final String FAILED_MESSAGES_WHERE_CLAUSE = @@ -79,11 +78,6 @@ public abstract class NotificationState { */ public abstract PendingIntent getClearIntent(); - /** - * The intent to be triggered when mark as read is pressed. - */ - public abstract PendingIntent getReadIntent(); - protected Uri getAttachmentUri() { return null; } @@ -122,10 +116,6 @@ public abstract class NotificationState { return mBaseRequestCode + CLEAR_INTENT_REQUEST_CODE_OFFSET; } - public int getReadIntentRequestCode() { - return mBaseRequestCode + READ_INTENT_REQUEST_CODE_OFFSET; - } - /** * Gets the appropriate icon needed for notifications. */ diff --git a/src/com/android/messaging/receiver/NotificationReceiver.java b/src/com/android/messaging/receiver/NotificationReceiver.java index f87779c..bbb847d 100644 --- a/src/com/android/messaging/receiver/NotificationReceiver.java +++ b/src/com/android/messaging/receiver/NotificationReceiver.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.Intent; import com.android.messaging.datamodel.BugleNotifications; -import com.android.messaging.datamodel.action.MarkAsReadAction; import com.android.messaging.datamodel.action.MarkAsSeenAction; import com.android.messaging.ui.UIIntents; import com.android.messaging.util.ConversationIdSet; @@ -53,15 +52,6 @@ public class NotificationReceiver extends BroadcastReceiver { BugleNotifications.resetLastMessageDing(conversationId); } } - } else if (intent.getAction().equals(UIIntents.ACTION_MARK_AS_READ)) { - final String conversationIdSetString = - intent.getStringExtra(UIIntents.UI_INTENT_EXTRA_CONVERSATION_ID_SET); - if (conversationIdSetString != null) { - for (final String conversationId : - ConversationIdSet.createSet(conversationIdSetString)) { - MarkAsReadAction.markAsRead(conversationId); - } - } } } -} +} \ No newline at end of file diff --git a/src/com/android/messaging/ui/UIIntents.java b/src/com/android/messaging/ui/UIIntents.java index de23737..bf5edd7 100644 --- a/src/com/android/messaging/ui/UIIntents.java +++ b/src/com/android/messaging/ui/UIIntents.java @@ -69,9 +69,6 @@ public abstract class UIIntents { public static final String ACTION_RESET_NOTIFICATIONS = "com.android.messaging.reset_notifications"; - public static final String ACTION_MARK_AS_READ = - "com.android.messaging.mark_as_read"; - // Sending VCard uri to VCard detail activity public static final String UI_INTENT_EXTRA_VCARD_URI = "vcard_uri"; @@ -336,14 +333,6 @@ public abstract class UIIntents { final int updateTargets, final ConversationIdSet conversationIdSet, final int requestCode); - /** - * Get a PendingIntent for marking a conversation as read. - * - *

This is intended to be used by notifications. - */ - public abstract PendingIntent getPendingIntentForMarkingAsRead(final Context context, - final ConversationIdSet conversationIdSet, final int requestCode); - /** * Get a PendingIntent for showing low storage notifications. */ diff --git a/src/com/android/messaging/ui/UIIntentsImpl.java b/src/com/android/messaging/ui/UIIntentsImpl.java index 9c1f5bf..8a1224a 100644 --- a/src/com/android/messaging/ui/UIIntentsImpl.java +++ b/src/com/android/messaging/ui/UIIntentsImpl.java @@ -431,20 +431,6 @@ public class UIIntentsImpl extends UIIntents { PendingIntent.FLAG_UPDATE_CURRENT); } - @Override - public PendingIntent getPendingIntentForMarkingAsRead(final Context context, - final ConversationIdSet conversationIdSet, final int requestCode) { - final Intent intent = new Intent(context, NotificationReceiver.class); - intent.setAction(ACTION_MARK_AS_READ); - if (conversationIdSet != null) { - intent.putExtra(UI_INTENT_EXTRA_CONVERSATION_ID_SET, - conversationIdSet.getDelimitedString()); - } - return PendingIntent.getBroadcast(context, - requestCode, intent, - PendingIntent.FLAG_UPDATE_CURRENT); - } - /** * Gets a PendingIntent associated with an Intent to start an Activity. All notifications * that starts an Activity must use this method to get a PendingIntent, which achieves two