From 3a9f54cee876ebff4b83f62596adfef989070d7f Mon Sep 17 00:00:00 2001 From: Raman Tenneti Date: Tue, 19 May 2020 22:17:39 +0000 Subject: [PATCH] Revert "Messaging: Show quick reply choices only on wearable devices" This reverts commit dffc4fa5783cfa854edaf11ff3c789e588ad66c8. Reason for revert: Reverting per Taesu Lee's comments - https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1259839 @Raman, This new feature still doesn't work properly. As we know Luca has been submitted CL:1271087 and CL:1271088 to fix it. But it still has issues. Change-Id: I2e8eb1fce302b12f3f30b8163da7e749c08733d9 --- .../android/messaging/datamodel/BugleNotifications.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/android/messaging/datamodel/BugleNotifications.java b/src/com/android/messaging/datamodel/BugleNotifications.java index 0e54027..9b96c6e 100644 --- a/src/com/android/messaging/datamodel/BugleNotifications.java +++ b/src/com/android/messaging/datamodel/BugleNotifications.java @@ -906,10 +906,6 @@ public class BugleNotifications { final NotificationCompat.Action.Builder actionBuilder = new NotificationCompat.Action.Builder(R.drawable.ic_wear_reply, context.getString(replyLabelRes), replyPendingIntent); - - notifBuilder.addAction(actionBuilder.build()); - - // Support the action on a wearable device as well final String[] choices = context.getResources().getStringArray( R.array.notification_reply_choices); final RemoteInput remoteInput = new RemoteInput.Builder(Intent.EXTRA_TEXT).setLabel( @@ -917,6 +913,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()); }