From 938468da6f5c225ebb161a68bd949c9cf3261892 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Tue, 24 Oct 2017 14:05:52 -0700 Subject: Rename the new bubble package name from "bubble" to "newbubble". It fixes AOSP for package name conflict. Test: manual PiperOrigin-RevId: 173298696 Change-Id: Id10ebe0bcf029e61f65cf6580c7198abd8395081 --- java/com/android/incallui/StatusBarNotifier.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'java/com/android/incallui/StatusBarNotifier.java') diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java index 7ff0040e2..4ce43935e 100644 --- a/java/com/android/incallui/StatusBarNotifier.java +++ b/java/com/android/incallui/StatusBarNotifier.java @@ -376,8 +376,6 @@ public class StatusBarNotifier builder.setColorized(true); builder.setChannelId(NotificationChannelId.ONGOING_CALL); } - // This will be ignored on O+ and handled by the channel - builder.setPriority(Notification.PRIORITY_MAX); break; default: break; @@ -648,7 +646,8 @@ public class StatusBarNotifier return R.drawable.ic_hd_call; } // If ReturnToCall is enabled, use the static icon. The animated one will show in the bubble. - if (ReturnToCallController.isEnabled(mContext)) { + if (ReturnToCallController.isEnabled(mContext) + || NewReturnToCallController.isEnabled(mContext)) { return R.drawable.quantum_ic_call_vd_theme_24; } else { return R.drawable.on_going_call; @@ -714,7 +713,7 @@ public class StatusBarNotifier if (resId == R.string.notification_incoming_call_wifi_template || resId == R.string.notification_ongoing_call_wifi_template) { - // TODO(b/64525903): Potentially apply this template logic everywhere. + // TODO(a bug): Potentially apply this template logic everywhere. return mContext.getString(resId, wifiBrand); } @@ -1027,11 +1026,6 @@ public class StatusBarNotifier @Override public void onAudioStateChanged(CallAudioState audioState) { - if (CallList.getInstance().getActiveOrBackgroundCall() == null) { - // We only care about speaker mode when in call - return; - } - updateNotification(); } -- cgit v1.2.3