Merge "Revert "Messaging: Show quick reply choices only on wearable devices"" am: 3de360b933 am: 54f00b323c am: 09441e4649 am: cc45cb0c0f am: 70498ea303

Change-Id: I5b00513bbdcb298e6df8d68d76c08c049fbba9b5

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