diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-26 03:07:59 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-26 03:07:59 +0000 |
| commit | f7ca638248d8539e16064263e53664d9b5717bd5 (patch) | |
| tree | c7425146f41d2f9f10e982b4024788927b88b89c | |
| parent | e2b91369fed510780ffb3643edafde0e95bea1b9 (diff) | |
| parent | 31323cf3022120a9bbf7d9418452097f99fd3fee (diff) | |
| download | Dialer-f7ca638248d8539e16064263e53664d9b5717bd5.tar.gz | |
Snap for 7495277 from 31323cf3022120a9bbf7d9418452097f99fd3fee to sc-release
Change-Id: Ib76eb7cd8a5d5e32cd5420005d86a0f99942781c
| -rw-r--r-- | framework/fake/src/com/android/car/dialer/framework/AdbBroadcastReceiver.java | 2 | ||||
| -rw-r--r-- | res/values/configs.xml | 6 | ||||
| -rw-r--r-- | src/com/android/car/dialer/ui/common/DialerUtils.java | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/framework/fake/src/com/android/car/dialer/framework/AdbBroadcastReceiver.java b/framework/fake/src/com/android/car/dialer/framework/AdbBroadcastReceiver.java index 02cf0727..0c058607 100644 --- a/framework/fake/src/com/android/car/dialer/framework/AdbBroadcastReceiver.java +++ b/framework/fake/src/com/android/car/dialer/framework/AdbBroadcastReceiver.java @@ -39,7 +39,7 @@ public class AdbBroadcastReceiver extends BroadcastReceiver { private static final String ACTION_CONNECT = "connect"; private static final String ACTION_DISCONNECT = "disconnect"; private static final String ACTION_ADDCALL = "addCall"; - private static final String ACTION_RECEIVECALL = "receiveCall"; + private static final String ACTION_RECEIVECALL = "rcvCall"; private static final String ACTION_ENDCALL = "endCall"; private static final String ACTION_CLEARALL = "clearAll"; private static final String ACTION_MERGE = "merge"; diff --git a/res/values/configs.xml b/res/values/configs.xml index f873a300..7ef4bcd9 100644 --- a/res/values/configs.xml +++ b/res/values/configs.xml @@ -47,10 +47,10 @@ <integer name="config_toolbar_title_mode">0</integer> <!-- A config determines whether to show the full screen ui when call is answered--> - <bool name="config_show_fullscreen_incall_ui">true</bool> + <bool name="config_show_fullscreen_incall_ui">false</bool> <!-- A config determines whether to show an entry in setting to config showing full screen UI when call is answered--> - <bool name="config_should_show_active_call_setting">false</bool> + <bool name="config_should_show_active_call_setting">true</bool> <!-- Config for enabling incoming call HUN fullscreen intent --> <bool name="config_show_hun_fullscreen_incall_ui">true</bool> @@ -59,7 +59,7 @@ <bool name="config_should_suppress_incoming_call_hun">false</bool> <!-- A config determines whether to show an entry in setting to config showing a heads up notification when there's a incoming call--> - <bool name="config_should_show_incoming_call_hun_setting">false</bool> + <bool name="config_should_show_incoming_call_hun_setting">true</bool> <!-- A config determines whether to show type down list on Dialpad --> <bool name="config_show_type_down_list_on_dialpad">true</bool> diff --git a/src/com/android/car/dialer/ui/common/DialerUtils.java b/src/com/android/car/dialer/ui/common/DialerUtils.java index 7235ec90..e570106d 100644 --- a/src/com/android/car/dialer/ui/common/DialerUtils.java +++ b/src/com/android/car/dialer/ui/common/DialerUtils.java @@ -76,8 +76,10 @@ public class DialerUtils { : readableLabel); item.setBody(TelecomUtils.getBidiWrappedNumber(number.getNumber())); item.setOnCheckedChangeListener((i, isChecked) -> { - selectedPhoneNumber.clear(); - selectedPhoneNumber.add(number); + if (isChecked) { + selectedPhoneNumber.clear(); + selectedPhoneNumber.add(number); + } }); items.add(item); } |