commit beaaff27e6ea36ddab00ccf259bb73a18208f5c2
author yueg <yueg@google.com> Fri Feb 02 17:28:02 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Mon Feb 05 16:33:16 2018 -0800
tree 5757287797756cc443b25e2007244f0cbee75a44
parent 3c7c669918e58f301f27b4d9cbb7d80a7b4ebabc

Remove bubble v1.

Bug: 67605985
Test: manual
PiperOrigin-RevId: 184358120
Change-Id: I17288da2b059f18bd51247e27aa174c7994e6f05

java/com/android/incallui/StatusBarNotifier.java

diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java
index 960fd14..87f332a 100644
--- a/java/com/android/incallui/StatusBarNotifier.java
+++ b/java/com/android/incallui/StatusBarNotifier.java
@@ -657,8 +657,8 @@
     } else if (call.hasProperty(Details.PROPERTY_HAS_CDMA_VOICE_PRIVACY)) {
       return R.drawable.quantum_ic_phone_locked_vd_theme_24;
     }
-    // If ReturnToCall is enabled, use the static icon. The animated one will show in the bubble.
-    if (ReturnToCallController.isEnabled(context) || NewReturnToCallController.isEnabled(context)) {
+    // If NewReturnToCall is enabled, use the static icon. The animated one will show in the bubble.
+    if (NewReturnToCallController.isEnabled(context)) {
       return R.drawable.quantum_ic_call_vd_theme_24;
     } else {
       return R.drawable.on_going_call;