diff options
-rw-r--r-- | assets/quantum/res/drawable/quantum_ic_exit_to_app_flip_vd_theme_24.xml (renamed from assets/quantum/res/drawable/quantum_ic_exit_to_app_vd_theme_24.xml) | 10 | ||||
-rw-r--r-- | java/com/android/incallui/NewReturnToCallController.java | 13 | ||||
-rw-r--r-- | java/com/android/newbubble/NewBubble.java | 3 | ||||
-rw-r--r-- | java/com/android/newbubble/stub/NewBubbleStub.java | 3 |
4 files changed, 10 insertions, 19 deletions
diff --git a/assets/quantum/res/drawable/quantum_ic_exit_to_app_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_exit_to_app_flip_vd_theme_24.xml index 5279f0483..3dfbf2b0e 100644 --- a/assets/quantum/res/drawable/quantum_ic_exit_to_app_vd_theme_24.xml +++ b/assets/quantum/res/drawable/quantum_ic_exit_to_app_flip_vd_theme_24.xml @@ -19,7 +19,11 @@ android:viewportWidth="24.0" android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> - <path - android:fillColor="@android:color/white" - android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/> + <group + android:pivotX="12" + android:scaleX="-1"> + <path + android:fillColor="@android:color/white" + android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/> + </group> </vector>
\ No newline at end of file diff --git a/java/com/android/incallui/NewReturnToCallController.java b/java/com/android/incallui/NewReturnToCallController.java index e37b14734..c588dc4e1 100644 --- a/java/com/android/incallui/NewReturnToCallController.java +++ b/java/com/android/incallui/NewReturnToCallController.java @@ -119,14 +119,6 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au } } - private void hideAndReset() { - if (bubble != null) { - bubble.hideAndReset(); - } else { - LogUtil.i("ReturnToCallController.reset", "reset() called without calling show()"); - } - } - private void show() { if (bubble == null) { bubble = startBubble(); @@ -189,7 +181,7 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au if (!TelecomUtil.isInCall(context) || CallList.getInstance().getIncomingCall() != null) { bubble.showText(context.getText(R.string.incall_call_ended)); } - hideAndReset(); + hide(); } else { startContactInfoSearch(); } @@ -258,7 +250,8 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au // Return to call actions.add( Action.builder() - .setIconDrawable(context.getDrawable(R.drawable.quantum_ic_exit_to_app_vd_theme_24)) + .setIconDrawable( + context.getDrawable(R.drawable.quantum_ic_exit_to_app_flip_vd_theme_24)) .setIntent(fullScreen) .setName(context.getText(R.string.bubble_return_to_call)) .setCheckable(false) diff --git a/java/com/android/newbubble/NewBubble.java b/java/com/android/newbubble/NewBubble.java index 8f1be6458..785593c5c 100644 --- a/java/com/android/newbubble/NewBubble.java +++ b/java/com/android/newbubble/NewBubble.java @@ -37,9 +37,6 @@ public interface NewBubble { /** Hide the bubble. */ void hide(); - /** Hide the bubble and reset to initial state */ - void hideAndReset(); - /** Returns whether the bubble is currently visible */ boolean isVisible(); diff --git a/java/com/android/newbubble/stub/NewBubbleStub.java b/java/com/android/newbubble/stub/NewBubbleStub.java index 4079aaaba..f5121cff9 100644 --- a/java/com/android/newbubble/stub/NewBubbleStub.java +++ b/java/com/android/newbubble/stub/NewBubbleStub.java @@ -36,9 +36,6 @@ public class NewBubbleStub implements NewBubble { public void hide() {} @Override - public void hideAndReset() {} - - @Override public boolean isVisible() { return false; } |