diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-10 02:23:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-10 02:23:46 +0000 |
| commit | d5514615336a16a83b885c4c18bcbcddccdf9407 (patch) | |
| tree | fb855d25b3e7ea777beaa7de19ab729c977ef0e5 /java/com/android/incallui/StatusBarNotifier.java | |
| parent | 4093c4fcbb9fb519c90eac618ed6d6fe0fdd4cec (diff) | |
| parent | 48f93f40f66f5695cdb370af679db4580cebb641 (diff) | |
Merge changes Ieab3ee3f,I4b917d8a
* changes:
Remove bubble "new" prefix.
Dismiss keyboard when opening overflow menu in RTT call.
Diffstat (limited to 'java/com/android/incallui/StatusBarNotifier.java')
| -rw-r--r-- | java/com/android/incallui/StatusBarNotifier.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java index 87f332a1d..e2340b5e7 100644 --- a/java/com/android/incallui/StatusBarNotifier.java +++ b/java/com/android/incallui/StatusBarNotifier.java @@ -657,8 +657,8 @@ public class StatusBarNotifier } else if (call.hasProperty(Details.PROPERTY_HAS_CDMA_VOICE_PRIVACY)) { return R.drawable.quantum_ic_phone_locked_vd_theme_24; } - // If NewReturnToCall is enabled, use the static icon. The animated one will show in the bubble. - if (NewReturnToCallController.isEnabled(context)) { + // If ReturnToCall is enabled, use the static icon. The animated one will show in the bubble. + if (ReturnToCallController.isEnabled(context)) { return R.drawable.quantum_ic_call_vd_theme_24; } else { return R.drawable.on_going_call; |