Remove bubble "new" prefix.
Test: BubbleImplTest, BubbleImplIntegrationTest, ReturnToCallControllerTest, ReturnToCallActionReceiverTest, BottomActionViewControllerTest, ChangeOnScreenBoundsTest
PiperOrigin-RevId: 188558386
Change-Id: Ieab3ee3f148092312a50597b41c0975419756e23
diff --git a/java/com/android/incallui/InCallServiceImpl.java b/java/com/android/incallui/InCallServiceImpl.java
index a7095f8..959f13f 100644
--- a/java/com/android/incallui/InCallServiceImpl.java
+++ b/java/com/android/incallui/InCallServiceImpl.java
@@ -40,7 +40,7 @@
*/
public class InCallServiceImpl extends InCallService {
- private NewReturnToCallController newReturnToCallController;
+ private ReturnToCallController returnToCallController;
private CallList.Listener feedbackListener;
// We only expect there to be one speakEasyCallManager to be instantiated at a time.
// We did not use a singleton SpeakEasyCallManager to avoid holding on to state beyond the
@@ -111,9 +111,9 @@
InCallPresenter.getInstance().onServiceBind();
InCallPresenter.getInstance().maybeStartRevealAnimation(intent);
TelecomAdapter.getInstance().setInCallService(this);
- if (NewReturnToCallController.isEnabled(this)) {
- newReturnToCallController =
- new NewReturnToCallController(this, ContactInfoCache.getInstance(context));
+ if (ReturnToCallController.isEnabled(this)) {
+ returnToCallController =
+ new ReturnToCallController(this, ContactInfoCache.getInstance(context));
}
feedbackListener = FeedbackComponent.get(context).getCallFeedbackListener();
CallList.getInstance().addListener(feedbackListener);
@@ -141,9 +141,9 @@
// Tear down the InCall system
InCallPresenter.getInstance().tearDown();
TelecomAdapter.getInstance().clearInCallService();
- if (newReturnToCallController != null) {
- newReturnToCallController.tearDown();
- newReturnToCallController = null;
+ if (returnToCallController != null) {
+ returnToCallController.tearDown();
+ returnToCallController = null;
}
if (feedbackListener != null) {
CallList.getInstance().removeListener(feedbackListener);