summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/NewReturnToCallController.java
diff options
context:
space:
mode:
authoryueg <yueg@google.com>2017-11-01 16:22:28 -0700
committerzachh <zachh@google.com>2017-11-10 23:40:48 +0000
commit84ac49babc81c94357706c5073fdb89f27b5fdbd (patch)
tree4e92d59fcb444de033bc359928e2fce120118adb /java/com/android/incallui/NewReturnToCallController.java
parent65e19075682f3c0cdaca367138560d80ac4a3106 (diff)
Implement some UI changes.
Including: - merge end call button with other buttons - add ripple effect for buttons - adjust elevation according to material design guide - add triangle in expanded view Bug: 67605985 Test: manual PiperOrigin-RevId: 174253861 Change-Id: I7b5315245a322235efb39a9cda26b8686cc7bbf9
Diffstat (limited to 'java/com/android/incallui/NewReturnToCallController.java')
-rw-r--r--java/com/android/incallui/NewReturnToCallController.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/java/com/android/incallui/NewReturnToCallController.java b/java/com/android/incallui/NewReturnToCallController.java
index fa7a45de0..97bf7ad50 100644
--- a/java/com/android/incallui/NewReturnToCallController.java
+++ b/java/com/android/incallui/NewReturnToCallController.java
@@ -277,17 +277,22 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au
List<Action> actions = new ArrayList<>();
SpeakerButtonInfo speakerButtonInfo = new SpeakerButtonInfo(audioState, IconSize.SIZE_24_DP);
+ // Return to call
actions.add(
Action.builder()
.setIconDrawable(context.getDrawable(R.drawable.quantum_ic_fullscreen_vd_theme_24))
.setIntent(fullScreen)
+ .setName(context.getText(R.string.bubble_return_to_call))
.build());
+ // Mute/unmute
actions.add(
Action.builder()
.setIconDrawable(context.getDrawable(R.drawable.quantum_ic_mic_off_white_24))
.setChecked(audioState.isMuted())
.setIntent(toggleMute)
+ .setName(context.getText(R.string.incall_label_mute))
.build());
+ // Speaker/audio selector
actions.add(
Action.builder()
.setIconDrawable(context.getDrawable(speakerButtonInfo.icon))
@@ -295,10 +300,12 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au
.setChecked(speakerButtonInfo.isChecked)
.setIntent(speakerButtonInfo.checkable ? toggleSpeaker : showSpeakerSelect)
.build());
+ // End call
actions.add(
Action.builder()
.setIconDrawable(context.getDrawable(R.drawable.quantum_ic_call_end_vd_theme_24))
.setIntent(endCall)
+ .setName(context.getText(R.string.incall_label_end_call))
.build());
return actions;
}