diff options
author | yueg <yueg@google.com> | 2018-02-06 17:32:47 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-02-06 17:34:48 -0800 |
commit | 4b9f28f9f3cc5b580ddb021ebeeb824ca97080ba (patch) | |
tree | 6429f0f1c11134a6b7accc2eb847b60c85d95025 /java/com/android/incallui | |
parent | c1fb21775fbaa33785d4e9abb46d34dce7e7b5f3 (diff) |
Bubble layout change.
- Flip back-to-call button icon.
- Use different button height for portrait and landscape. In order to make it work, we also create new ViewHolder object when bubble shows and remove reset() when bubble hides.
Bug: 67605985
Test: NewBubbleImplIntegrationTest, NewBubbleImplTest, NewReturnToCallControllerTest
PiperOrigin-RevId: 184768224
Change-Id: If4e613b12e39c647c34f4cb63a7f934043d42ec7
Diffstat (limited to 'java/com/android/incallui')
-rw-r--r-- | java/com/android/incallui/NewReturnToCallController.java | 13 |
1 files changed, 3 insertions, 10 deletions
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) |