filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Messaging: Add "Mark as read" quick action for message notifications" am: eb1e0417eb

Browse Source 
Change-Id: I631710ec3c472378ada25902c2c194dbf344fb24
This commit is contained in:
Raman Tenneti
2020-05-20 23:50:53 +00:00
committed by Automerger Merge Worker
parent 54f00b323c eb1e0417eb
commit c67142cead
8 changed files with 4 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/drawable/ic_wear_read.xml
View File

@@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#ffffff"
android:pathData="M0.41,13.41L6,19L7.41,17.58L1.83,12M22.24,5.58L11.66,16.17L7.5,12L6.07,13.41L11.66,19L23.66,7M18,7L16.59,5.58L10.24,11.93L11.66,13.34L18,7Z" />
</vector>

2
res/values/strings.xml
View File

@@ -236,8 +236,6 @@
<item quantity="one">New message</item>
<item quantity="other"><xliff:g id="messages">%d</xliff:g> new messages</item>
</plurals>
<!-- Mark message as read -->
<string name="notification_mark_as_read">Mark as read</string>
<!-- Text for starting a new conversation button in the compose UI -->
<string name="start_conversation">Start</string>

21
src/com/android/messaging/datamodel/BugleNotifications.java
View File

@@ -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)) {

8
src/com/android/messaging/datamodel/MessageNotificationState.java
View File

@@ -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.
*/

12
src/com/android/messaging/datamodel/NotificationState.java
View File

@@ -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.
*/

12
src/com/android/messaging/receiver/NotificationReceiver.java
View File

@@ -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);
}
}
}
}
}
}

11
src/com/android/messaging/ui/UIIntents.java
View File

@@ -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.
*
* <p>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.
*/

14
src/com/android/messaging/ui/UIIntentsImpl.java
View File

@@ -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