Merge "Revert "Messaging: Show quick reply choices only on wearable devices""
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 @@
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 @@
setChoices(choices)
.build();
actionBuilder.addRemoteInput(remoteInput);
+ notifBuilder.addAction(actionBuilder.build());
+
+ // Support the action on a wearable device as well
wearableExtender.addAction(actionBuilder.build());
}