diff options
author | Alan Lau <alanlau@google.com> | 2014-05-27 16:13:47 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-27 16:13:47 +0000 |
commit | 8423a3849ca5de2cb1d3f28c87e85cfe68b01e87 (patch) | |
tree | dc89ca7b66cc12e1fbdd3a2d4978cfce102e5916 | |
parent | d34e7eb15f93f9b051abc0905f8d11020f7059d2 (diff) | |
parent | 7213f2aff2d722022284361812c0c3fdecdccfe4 (diff) | |
download | android_packages_apps_UnifiedEmail-8423a3849ca5de2cb1d3f28c87e85cfe68b01e87.tar.gz android_packages_apps_UnifiedEmail-8423a3849ca5de2cb1d3f28c87e85cfe68b01e87.tar.bz2 android_packages_apps_UnifiedEmail-8423a3849ca5de2cb1d3f28c87e85cfe68b01e87.zip |
am 7213f2af: Merge "Add reply choices for replying email from wearable." into ub-gmail-ur13-dev
* commit '7213f2aff2d722022284361812c0c3fdecdccfe4':
Add reply choices for replying email from wearable.
-rw-r--r-- | res/values/strings.xml | 33 | ||||
-rw-r--r-- | src/com/android/mail/utils/NotificationActionUtils.java | 7 |
2 files changed, 39 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index b8b919735..b21425ac1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1073,4 +1073,37 @@ Empty by default since this should be overridden by implementing apps. --> <string name="full_message_activity" translatable="false"></string> + <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> + <string name="reply_choice_yes">Yes</string> + <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> + <string name="reply_choice_no">No</string> + <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> + <string name="reply_choice_ok">OK</string> + <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> + <string name="reply_choice_hehe">Hehe</string> + <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> + <string name="reply_choice_thanks">Thanks</string> + <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> + <string name="reply_choice_i_agree">I agree</string> + <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> + <string name="reply_choice_nice">Nice</string> + <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> + <string name="reply_choice_later">I\'ll get back to you later</string> + <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> + <string name="reply_choice_smiling_face">:)</string> + <!-- One of the default canned responses used when replying to an email on a wearable device [CHAR LIMIT=30] --> + <string name="reply_choice_frowning_face">:(</string> + + <array name="reply_choices"> + <item>@string/reply_choice_yes</item> + <item>@string/reply_choice_no</item> + <item>@string/reply_choice_ok</item> + <item>@string/reply_choice_hehe</item> + <item>@string/reply_choice_thanks</item> + <item>@string/reply_choice_i_agree</item> + <item>@string/reply_choice_nice</item> + <item>@string/reply_choice_later</item> + <item>@string/reply_choice_smiling_face</item> + <item>@string/reply_choice_frowning_face</item> + </array> </resources> diff --git a/src/com/android/mail/utils/NotificationActionUtils.java b/src/com/android/mail/utils/NotificationActionUtils.java index 089b9f57b..c22dcf994 100644 --- a/src/com/android/mail/utils/NotificationActionUtils.java +++ b/src/com/android/mail/utils/NotificationActionUtils.java @@ -222,8 +222,13 @@ public class NotificationActionUtils { actionIconResId, title, pendingIntent); if (notificationAction == NotificationActionType.REPLY || notificationAction == NotificationActionType.REPLY_ALL) { + String[] choices = context.getResources().getStringArray(R.array.reply_choices); wearableActionBuilder.addRemoteInput( - new RemoteInput.Builder(WEAR_REPLY_INPUT).setLabel(title).build()); + new RemoteInput.Builder(WEAR_REPLY_INPUT) + .setLabel(title) + .setChoices(choices) + .build() + ); LogUtils.d(LOG_TAG, "Adding wearable action!!"); } |