diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-23 00:47:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-23 00:47:24 +0000 |
| commit | 6c773cbf112e5bef6074776d8cd91139d810f0ec (patch) | |
| tree | 864af958509967249c92a2c0196a51ed66482574 /java/com/android/incallui/NewReturnToCallController.java | |
| parent | ecbcc5c8cce01c70480e73284a9e5e1115fc6649 (diff) | |
| parent | 572a77ed339b5a511f9dc20680939dbb7bf5e085 (diff) | |
Merge changes I50da0d2d,Id00debe2,I2807510e,I3f7836d8,I2e31cd11, ...
* changes:
Automated rollback of changelist 176587256
Check Contacts support for preferred SIM
Add SpamJobType for all spam job IDs.
Bubble v2 UI changes.
Allow deleting a call log entry in the call log UI and the call details UI.
Fix showing CallingAccountSelector in lock screen
Diffstat (limited to 'java/com/android/incallui/NewReturnToCallController.java')
| -rw-r--r-- | java/com/android/incallui/NewReturnToCallController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/android/incallui/NewReturnToCallController.java b/java/com/android/incallui/NewReturnToCallController.java index 8f2463e8b..399b18568 100644 --- a/java/com/android/incallui/NewReturnToCallController.java +++ b/java/com/android/incallui/NewReturnToCallController.java @@ -280,7 +280,7 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au // Return to call actions.add( Action.builder() - .setIconDrawable(context.getDrawable(R.drawable.quantum_ic_fullscreen_vd_theme_24)) + .setIconDrawable(context.getDrawable(R.drawable.quantum_ic_exit_to_app_vd_theme_24)) .setIntent(fullScreen) .setName(context.getText(R.string.bubble_return_to_call)) .build()); |