From c6cbb12dae278b455b1a05e0ee6b0b164e5318c7 Mon Sep 17 00:00:00 2001 From: wangqi Date: Thu, 15 Mar 2018 10:17:21 -0700 Subject: Add audio select menu. Bug: 67596257 Test: manual PiperOrigin-RevId: 189204691 Change-Id: I9ecd36ce1c27072dea4ae87beeecd4565bf05378 --- .../quantum_ic_bluetooth_audio_vd_theme_24.xml | 25 +++++++ .../drawable/quantum_ic_headset_vd_theme_24.xml | 25 +++++++ .../quantum_ic_phone_in_talk_vd_theme_24.xml | 25 +++++++ .../incallui/commontheme/res/values/colors.xml | 2 + .../android/incallui/rtt/impl/AudioSelectMenu.java | 83 ++++++++++++++++++++++ .../android/incallui/rtt/impl/RttChatFragment.java | 9 ++- .../incallui/rtt/impl/res/layout/audio_route.xml | 54 ++++++++++++++ .../incallui/rtt/impl/res/values/strings.xml | 4 ++ 8 files changed, 224 insertions(+), 3 deletions(-) create mode 100644 assets/quantum/res/drawable/quantum_ic_bluetooth_audio_vd_theme_24.xml create mode 100644 assets/quantum/res/drawable/quantum_ic_headset_vd_theme_24.xml create mode 100644 assets/quantum/res/drawable/quantum_ic_phone_in_talk_vd_theme_24.xml create mode 100644 java/com/android/incallui/rtt/impl/AudioSelectMenu.java create mode 100644 java/com/android/incallui/rtt/impl/res/layout/audio_route.xml diff --git a/assets/quantum/res/drawable/quantum_ic_bluetooth_audio_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_bluetooth_audio_vd_theme_24.xml new file mode 100644 index 000000000..f5a7e8bea --- /dev/null +++ b/assets/quantum/res/drawable/quantum_ic_bluetooth_audio_vd_theme_24.xml @@ -0,0 +1,25 @@ + + + + diff --git a/assets/quantum/res/drawable/quantum_ic_headset_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_headset_vd_theme_24.xml new file mode 100644 index 000000000..4d65b4d97 --- /dev/null +++ b/assets/quantum/res/drawable/quantum_ic_headset_vd_theme_24.xml @@ -0,0 +1,25 @@ + + + + diff --git a/assets/quantum/res/drawable/quantum_ic_phone_in_talk_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_phone_in_talk_vd_theme_24.xml new file mode 100644 index 000000000..d17155107 --- /dev/null +++ b/assets/quantum/res/drawable/quantum_ic_phone_in_talk_vd_theme_24.xml @@ -0,0 +1,25 @@ + + + + diff --git a/java/com/android/incallui/commontheme/res/values/colors.xml b/java/com/android/incallui/commontheme/res/values/colors.xml index 50b06179f..27c1b6c20 100644 --- a/java/com/android/incallui/commontheme/res/values/colors.xml +++ b/java/com/android/incallui/commontheme/res/values/colors.xml @@ -21,4 +21,6 @@ @color/blocked_contact_background + + #D8D8D8 diff --git a/java/com/android/incallui/rtt/impl/AudioSelectMenu.java b/java/com/android/incallui/rtt/impl/AudioSelectMenu.java new file mode 100644 index 000000000..2d4ab3989 --- /dev/null +++ b/java/com/android/incallui/rtt/impl/AudioSelectMenu.java @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.incallui.rtt.impl; + +import android.content.Context; +import android.content.res.ColorStateList; +import android.graphics.PorterDuff.Mode; +import android.telecom.CallAudioState; +import android.view.View; +import android.widget.PopupWindow; +import com.android.incallui.incall.protocol.InCallButtonUiDelegate; + +/** Audio select menu for RTT call. */ +public class AudioSelectMenu extends PopupWindow { + + private final InCallButtonUiDelegate inCallButtonUiDelegate; + private final Context context; + private final OnButtonClickListener onButtonClickListener; + + interface OnButtonClickListener { + void onBackPressed(); + } + + AudioSelectMenu( + Context context, + InCallButtonUiDelegate inCallButtonUiDelegate, + OnButtonClickListener onButtonClickListener) { + super(context); + this.context = context; + this.inCallButtonUiDelegate = inCallButtonUiDelegate; + this.onButtonClickListener = onButtonClickListener; + View view = View.inflate(context, R.layout.audio_route, null); + setContentView(view); + setOnDismissListener(this::dismiss); + setFocusable(true); + setWidth(context.getResources().getDimensionPixelSize(R.dimen.rtt_overflow_menu_width)); + view.findViewById(R.id.audioroute_back) + .setOnClickListener( + v -> { + dismiss(); + this.onButtonClickListener.onBackPressed(); + }); + CallAudioState audioState = inCallButtonUiDelegate.getCurrentAudioState(); + initItem( + view.findViewById(R.id.audioroute_bluetooth), CallAudioState.ROUTE_BLUETOOTH, audioState); + initItem(view.findViewById(R.id.audioroute_speaker), CallAudioState.ROUTE_SPEAKER, audioState); + initItem( + view.findViewById(R.id.audioroute_headset), CallAudioState.ROUTE_WIRED_HEADSET, audioState); + initItem( + view.findViewById(R.id.audioroute_earpiece), CallAudioState.ROUTE_EARPIECE, audioState); + } + + private void initItem(RttCheckableButton item, final int itemRoute, CallAudioState audioState) { + int selectedColor = + context.getColor(com.android.incallui.audioroute.R.color.dialer_theme_color); + if ((audioState.getSupportedRouteMask() & itemRoute) == 0) { + item.setVisibility(View.GONE); + } else if (audioState.getRoute() == itemRoute) { + item.setTextColor(selectedColor); + item.setCompoundDrawableTintList(ColorStateList.valueOf(selectedColor)); + item.setCompoundDrawableTintMode(Mode.SRC_ATOP); + } + item.setOnClickListener( + (v) -> { + dismiss(); + inCallButtonUiDelegate.setAudioRoute(itemRoute); + }); + } +} diff --git a/java/com/android/incallui/rtt/impl/RttChatFragment.java b/java/com/android/incallui/rtt/impl/RttChatFragment.java index c6eef9ca2..dd55ccff7 100644 --- a/java/com/android/incallui/rtt/impl/RttChatFragment.java +++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java @@ -48,7 +48,6 @@ import com.android.dialer.common.Assert; import com.android.dialer.common.FragmentUtils; import com.android.dialer.common.LogUtil; import com.android.dialer.common.UiUtil; -import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment; import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter; import com.android.incallui.call.DialerCall.State; import com.android.incallui.hold.OnHoldFragment; @@ -447,8 +446,12 @@ public class RttChatFragment extends Fragment @Override public void showAudioRouteSelector() { - AudioRouteSelectorDialogFragment.newInstance(inCallButtonUiDelegate.getCurrentAudioState()) - .show(getChildFragmentManager(), null); + AudioSelectMenu audioSelectMenu = + new AudioSelectMenu( + getContext(), + inCallButtonUiDelegate, + () -> overflowMenu.showAtLocation(getView(), Gravity.TOP | Gravity.RIGHT, 0, 0)); + audioSelectMenu.showAtLocation(getView(), Gravity.TOP | Gravity.RIGHT, 0, 0); } @Override diff --git a/java/com/android/incallui/rtt/impl/res/layout/audio_route.xml b/java/com/android/incallui/rtt/impl/res/layout/audio_route.xml new file mode 100644 index 000000000..89b5c76f0 --- /dev/null +++ b/java/com/android/incallui/rtt/impl/res/layout/audio_route.xml @@ -0,0 +1,54 @@ + + + + + + + + + + \ No newline at end of file diff --git a/java/com/android/incallui/rtt/impl/res/values/strings.xml b/java/com/android/incallui/rtt/impl/res/values/strings.xml index 0b9eb71f4..dce16fdda 100644 --- a/java/com/android/incallui/rtt/impl/res/values/strings.xml +++ b/java/com/android/incallui/rtt/impl/res/values/strings.xml @@ -23,4 +23,8 @@ Avatar + + + Back + \ No newline at end of file -- cgit v1.2.3