diff options
| author | Uchenna Okoye <uokoye@google.com> | 2021-07-02 18:03:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-02 18:03:21 +0000 |
| commit | e1159f865e00da8117458a41c110f5952941babf (patch) | |
| tree | eddda8967b0f94dcf070004af3981548dce869e6 | |
| parent | b0fe09bf9555a6ea17fc884bfaa35a9af251abb7 (diff) | |
| parent | 9d975a11a7bed2bd51366ff30adf6dfb103f9653 (diff) | |
| download | Messenger-e1159f865e00da8117458a41c110f5952941babf.tar.gz | |
Add feature flag for Tap To Read Conversation to allow partners turn on once API is ready. am: 9d975a11a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Messenger/+/15182432
Change-Id: Iab51bf4eab9f4e85df3f19ee5d2fc6fb406531a3
| -rw-r--r-- | res/values/config.xml | 1 | ||||
| -rw-r--r-- | src/com/android/car/messenger/core/util/VoiceUtil.java | 24 |
2 files changed, 15 insertions, 10 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 990b53d..644c7ff 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -17,6 +17,7 @@ <resources> <bool name="group_avatar_fill_background">false</bool> <bool name="direct_send_supported">false</bool> + <bool name="ttr_conversation_supported">false</bool> <!-- The maximum number of individual avatars used for group avatar. diff --git a/src/com/android/car/messenger/core/util/VoiceUtil.java b/src/com/android/car/messenger/core/util/VoiceUtil.java index bb204f3..6a7a049 100644 --- a/src/com/android/car/messenger/core/util/VoiceUtil.java +++ b/src/com/android/car/messenger/core/util/VoiceUtil.java @@ -108,19 +108,23 @@ public class VoiceUtil { Bundle args = new Bundle(); Conversation tapToReadConversation = createTapToReadConversation(conversation, userAccount.getId()); - // use legacy tap to read by default as support for - // new api using Conversation class is still very limited and very nascent - StatusBarNotification sbn = - NotificationHandler.postNotificationForLegacyTapToRead(tapToReadConversation); - if (sbn != null) { - args.putString(KEY_ACTION, notificationAction); - args.putParcelable(KEY_NOTIFICATION, sbn); - } else { + boolean isConversationSupported = + activity.getResources().getBoolean(R.bool.ttr_conversation_supported); + if (isConversationSupported) { // New API using generic Conversation class - // is currently limited in support by partner assistants and is currently being phase - // in. + // is currently limited in support by partner assistants and is being phased in. args.putString(KEY_ACTION, conversationAction); args.putBundle(KEY_CONVERSATION, tapToReadConversation.toBundle()); + } else { + // Continue using legacy SBN + StatusBarNotification sbn = + NotificationHandler.postNotificationForLegacyTapToRead(tapToReadConversation); + if (sbn == null) { + L.e("Failed to convert Conversation to SBN for Legacy Tap To Read."); + return; + } + args.putString(KEY_ACTION, notificationAction); + args.putParcelable(KEY_NOTIFICATION, sbn); } activity.showAssist(args); |