diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-19 23:02:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-19 23:02:34 +0000 |
| commit | f976beb4b56b9b0b1ea17c6466d79b16a4eb7477 (patch) | |
| tree | 4538bd3030d9cfaf2fa602f693bc483e8d947e11 /java/com/android/dialer/app/calllog | |
| parent | 0f76636bba4a2c01663c98fa4f3a88d3435e45d7 (diff) | |
| parent | e12f924c45d9e40dbdd23ad01b7bde855b82c4c8 (diff) | |
Merge changes Ic5616af0,I5e4c3e61
* changes:
Add flags for the Duo install, activate and invite buttons
Support dual alphabets in smart dial.
Diffstat (limited to 'java/com/android/dialer/app/calllog')
| -rw-r--r-- | java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java index 2baf117dc..15c4b5850 100644 --- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java +++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java @@ -691,15 +691,25 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder videoCallButtonView.setTag(IntentProvider.getDuoVideoIntentProvider(number)); videoCallButtonView.setVisibility(View.VISIBLE); } else if (duo.isActivated(mContext) && !identifiedSpamCall) { - inviteVideoButtonView.setTag(IntentProvider.getDuoInviteIntentProvider(number)); - inviteVideoButtonView.setVisibility(View.VISIBLE); + if (ConfigProviderBindings.get(mContext) + .getBoolean("enable_call_log_duo_invite_button", false)) { + inviteVideoButtonView.setTag(IntentProvider.getDuoInviteIntentProvider(number)); + inviteVideoButtonView.setVisibility(View.VISIBLE); + } } else if (duo.isEnabled(mContext) && !identifiedSpamCall) { if (!duo.isInstalled(mContext)) { - setUpVideoButtonView.setTag(IntentProvider.getInstallDuoIntentProvider()); + if (ConfigProviderBindings.get(mContext) + .getBoolean("enable_call_log_install_duo_button", false)) { + setUpVideoButtonView.setTag(IntentProvider.getInstallDuoIntentProvider()); + setUpVideoButtonView.setVisibility(View.VISIBLE); + } } else { - setUpVideoButtonView.setTag(IntentProvider.getSetUpDuoIntentProvider()); + if (ConfigProviderBindings.get(mContext) + .getBoolean("enable_call_log_activate_duo_button", false)) { + setUpVideoButtonView.setTag(IntentProvider.getSetUpDuoIntentProvider()); + setUpVideoButtonView.setVisibility(View.VISIBLE); + } } - setUpVideoButtonView.setVisibility(View.VISIBLE); } break; default: |