Commit Graph

35039 Commits

Author SHA1 Message Date
Peter Wang
ecd856eeeb Added an option in reset menu in Settings to enable resetting Euicc data
only

Bug: 159650638
Fix: 159650638
Test: Local
Change-Id: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
2020-12-15 18:27:34 -08:00
Malcolm Chen
1305cee98e Automatically dismiss SIM combination warnings and selection dialogs.
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-15 16:45:27 -08:00
Malcolm Chen
abd767ab1d Automatically dismiss SIM combination warnings and selection dialogs.
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-15 22:11:55 +00:00
Fan Zhang
8e154d094f a11y fix: read emergency numbers as digits, not numbers.
Instead of reading as one hundred and ten, it should read as one-one-o.

Also make the number override dialog text input box a little bigger

Fix: 175517632
Fix: 175514672
Test: robotests
Change-Id: I7e3e823792f885004868ede790fc414a3fa66f01
2020-12-15 12:29:39 -08:00
tim peng
b802a1a878 Merge "Remove MediaOutputGroupSlice" 2020-12-15 07:10:03 +00:00
Jiashen Wang
c1ed4d5485 Move eSIM reset before telephony manager reset in ResetNetworkConfirm
TelephonyManager#resetSettings triggers modem restart. It could cause
eSIM reset failure since Modem is not available. In order to resolve
this issue, we move eSIM reset befor telephony manager reset.
Bug: 175239934
Test: Manually tested

Change-Id: I44644c67577469898726ba07dcd6b68b3fb73b2a
2020-12-14 22:44:41 -08:00
Wilson Wu
8279b8ee5a Apply ResultCallback to isImeTraceEnabled
With CL[1], the isImeTraceEnabled in InputMethodManager
require to use ResultCallback mechanism. Change this API
usage in DevelopmentTiles.

[1] : I1547b98b2aacf764e33aadc9ab784f2013f58f2f

Bug: 163453493
Test: make RunSettingsRoboTests ROBOTEST_FILTER="WinscopeTraceTest"
Change-Id: I767069892c713023b064525105ef2b55946b7bb8
2020-12-15 14:08:11 +08:00
Hugh Chen
416110bac0 Add condition to check case of accessory combinations am: b767df1a08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a4502e3568d0049c4fff7f730b42d1bc975cea4
2020-12-15 05:01:42 +00:00
Hugh Chen
c61ec502f5 Do nothing when choosing file transfer when in accessory mode am: e8dc7bc283
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bd051363458a75a0dd190f41b0cf2901e3bf680
2020-12-15 05:01:34 +00:00
Hugh Chen
2676dd763c Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit. am: 91ed63124c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218253

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ca5a04cc2e8db3b2f50d1656fa54c8e02f8e394
2020-12-15 05:01:25 +00:00
Xiangyu/Malcolm Chen
aebc5db4f3 Merge "Automatically dismiss SIM combination warnings and selection dialogs." 2020-12-15 04:53:44 +00:00
timhypeng
c5a28d3ec0 Remove MediaOutputGroupPanel
Bug: 174192979
Test: build pass
Change-Id: I8023b66f24825bbe019c5d8369bb4813f5ba95f1
2020-12-15 12:25:04 +08:00
Yi Jiang
cf9e39b2f3 Merge "Grays out Screen Timeout Setting when disabled." 2020-12-15 02:59:04 +00:00
timhypeng
1602bccd9e Remove MediaOutputGroupSlice
Bug: 170558292
Test: build pass
Change-Id: I06c710a8b06c8666cb2cf5198d5b59eda7a7649a
2020-12-15 09:47:39 +08:00
Jiashen Wang
881d253247 Merge "Fix minor issue for DeleteEuiccSubscriptionDialogActivity" 2020-12-15 01:32:15 +00:00
TreeHugger Robot
92107059b1 Merge "Add a developer option to enable / disable location indicators." 2020-12-14 20:16:23 +00:00
Malcolm Chen
3ad8509b15 Automatically dismiss SIM combination warnings and selection dialogs.
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-14 11:55:07 -08:00
Yi Jiang
942e598092 Merge "Adds 'options disabled by admin' icon in timeout settings." 2020-12-14 18:06:50 +00:00
allenwtsu
91f11e9a47 Change carrier config
Use KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL instead of
KEY_USE_RCS_PRESENCE_BOOL

Bug: 173828080
Test: build pass
Change-Id: I384686bd073a00341f4e552b71b24798619502fa
2020-12-15 00:28:20 +08:00
Yi Jiang
aed7559a59 Adds 'options disabled by admin' icon in timeout settings.
Bug:171257091
Test: atest ScreenTimeoutSettingsTest

Change-Id: Id0411b009a2d4dc0e4f6abf2825580ca42ad8442
2020-12-14 00:31:51 -08:00
Hugh Chen
b767df1a08 Add condition to check case of accessory combinations
Before this CL, we only compare whether the value of function is
equal to accessory to ensure usb is in accessory mode. But in some
cases there are different accessory combinations, like
"accessory,audio source". It will make the condition return false
when encountering accessory combinations.

This CL will check whether the function will include accessory mode
to fix this issue.

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I7c80f02de5340799e292949608e19b86b187b982
Merged-In: I7c80f02de5340799e292949608e19b86b187b982
(cherry picked from commit 7d71081d45)
2020-12-14 07:32:41 +00:00
Hugh Chen
e8dc7bc283 Do nothing when choosing file transfer when in accessory mode
- Before this CL, the device will be disconnected and reconnected
  to accessory mode when choosing "File transfer/Android Auto" in
  accessory mode. Because the USB menu didn't check state of
  function, it should do nothing when choosing
  "File transfer/Android Auto" in accessory mode.

  This CL add condition to check state of function, it will do
  nothing when choosing "File transfer/Android Auto" in
  accessory mode.

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48
Merged-In: I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48
(cherry picked from commit 3251a04ba3)
2020-12-14 06:59:06 +00:00
Hugh Chen
91ed63124c Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit.
- Before this CL, the usb receivers didn't check the extra information
  of the accessory. It causes the usb menu not to be aware that the
  usb port is switched to accessory mode.

  In this CL, the receivers will check whether the intent has an
  accessory extra. If the usb port is switched to accessory mode
  the usb menu will switch to "File Transfer/Android Auto".

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I0eca89a23670c674b74753fc526256cc1d52e759
Merged-In: I0eca89a23670c674b74753fc526256cc1d52e759
(cherry picked from commit af0a45bb7a)
2020-12-14 06:58:26 +00:00
Wei Wang
edbe2cca13 Add a developer option to enable / disable location indicators.
Also bundled location related developer options into the location
category.

Bug:175357420

Test: Manual && make RunSettingsRoboTests ROBOTEST_FILTER=LocationScanningPreferenceControllerTest

Change-Id: Ic33ad6e70d258c9afc2cefba70ab6e7b2bafd16a
2020-12-13 21:33:56 -08:00
Jeremy Goldman
e092a54381 Merge "Update string for discarding changes to a particular APN's settings." 2020-12-14 04:42:09 +00:00
Jeremy Goldman
11f91e47ea Merge "Enhanced4gBasePreferenceControllerTest migrated to junit" 2020-12-14 02:58:24 +00:00
Jeremy Goldman
7a16e45290 Update string for discarding changes to a particular APN's settings.
Previously was unclear whether the changes, or the entire APN was
being discarded. The word "Cancel" more closely implies that the most
recent changes to the screen will be discarded rather than the entire
APN.

This only changes the resource for english. However, many other
languages have a menu_cancel string that seems much closer
to "Cancel" than "Discard" as well.

i.e. http://cs/android/packages/apps/Settings/res/values-zu/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb
http://cs/android/packages/apps/Settings/res/values-es/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb

Bug: 171538880
Test: N/A
Change-Id: I80fde04dbc36078d5c53e68231fcc4e5c3cf94e6
2020-12-14 02:57:39 +00:00
TreeHugger Robot
e1f15ccc1d Merge "Add the mutability flag to BluetoothDevicesSlice." 2020-12-14 02:47:41 +00:00
TreeHugger Robot
6571548a37 Merge "[Provider Model] Fix the NetworkDashboardFragmentTest failed issue" 2020-12-13 15:18:40 +00:00
Yi Jiang
111004958d Grays out Screen Timeout Setting when disabled.
Previously we would hide the screen timeout setting when it is disabled
by admin. Instead of hide it in Display Settings, now we gray it out and
also provide the info of the enforced admin.

Bug: 174834978
Test: manually
Change-Id: Idaa3c4512eb648b67fcf6df2996c771a2f1b9617
2020-12-11 15:53:45 -08:00
Jeremy Goldman
4348c2c826 Enhanced4gBasePreferenceControllerTest migrated to junit
Bug: 175389659
Test: atest -c Enhanced4gBasePreferenceControllerTest
Change-Id: I7ebcb303eb74168b81dd650fe78f3988647aa64d
2020-12-12 01:11:13 +08:00
Zim
abb239f4a4 Change transcoding default values
1. transcode_enabled: s/false/true/
2. transcode_default: s/false/true/

This is to maintain consistence with the MediaProvider defaults and it
only affects the 'checked' state when a user hasn't checked anything

Test: Manual
Bug: 175309276
Change-Id: Ic81490a944407e30f9cd207f64f2a0f5530a23d3
2020-12-11 15:48:21 +00:00
Zoey Chen
e05e21bfe7 Merge "[Provider Model] Should show "No SIM" if there is no SIM in the device." 2020-12-11 14:55:51 +00:00
Zoey Chen
44559badaf [Provider Model] Should show "No SIM" if there is no SIM in the device.
Bug: 172053880
Test: atest NetworkProviderCallsSmsControllerTest#getSummary_noSim_returnNoSim
Change-Id: I31fd8b4b6928ef8aa7c45ac7651fa26e0b08446e
2020-12-11 20:29:13 +08:00
Yi-Ling Chuang
32e7118161 Add the mutability flag to BluetoothDevicesSlice.
Starting Android S, all PendingIntent has to have a explicit mutability
flag set.

Fixes: 172207505
Fixes: 172811893
Test: Enable BluetoothDevicesSlice and play on it.
Play on the volume panel.

Change-Id: I618455de683d619fe300309e31864b3c64f12ad1
2020-12-11 15:32:23 +08:00
Robert Luo
4dd011b3c7 Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev 2020-12-11 06:56:24 +00:00
Robert Luo
a2e12619d5 Merge "Migrate media output switcher metrics - 3/n" into rvc-qpr-dev-plus-aosp 2020-12-11 02:15:47 +00:00
Weng Su
66869d2ff5 [Provider Model] Fix the NetworkDashboardFragmentTest failed issue
Since the getPreferenceScreenResId() is modified to return different resource ID when provider model enabled. So we need to update SEARCH_INDEX_DATA_PROVIDER class to match the same behavior.

Bug: 175290124
Test:
- Set Settings/System/Developer options/Feature
flags/settings_provider_model to true.
- atest -c NetworkDashboardFragmentTest

Change-Id: I05b0f830158429ddbbfba414cdb33a6df6a7465e
2020-12-10 13:29:49 +00:00
Manish Singh
7a418b240e Merge "Remove transcoding for apps from Settings." 2020-12-10 07:50:17 +00:00
Jiashen Wang
a0a5165c72 Fix minor issue for DeleteEuiccSubscriptionDialogActivity
Bug: 170508680
Test: Manually tested
Change-Id: I656b16f6ca568cd9f5dcbf9a0b031f1ee6f71b49
2020-12-09 23:27:04 -08:00
TreeHugger Robot
04322e2202 Merge "Add mutability flag to WifiSlice." 2020-12-10 06:37:36 +00:00
tim peng
b36ec713ce Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev am: 656867b4de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e1054e999a39a7a91ad9fa04f874b12370b8a89
2020-12-10 05:53:28 +00:00
tim peng
656867b4de Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev 2020-12-10 05:30:42 +00:00
Robert Luo
8da41d2eda Migrate media output switcher metrics - 3/n
Bug: 172181610
Test: run statsd_testdrive 277 and check the
output correctness after content switching.

Change-Id: I5abb471452ec92670d220b2472eadbe77e243653
Merged-In: I5abb471452ec92670d220b2472eadbe77e243653
2020-12-10 11:10:45 +08:00
Robert Luo
ce694271f2 Merge "Migrate media output switcher metrics - 3/n" 2020-12-10 02:36:59 +00:00
TreeHugger Robot
317aa9e772 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 am: 0b89867372 am: 79bf00aac3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2a7d0a9ebb8f0840a18f6997bd512f720e35a71
2020-12-09 14:50:28 +00:00
TreeHugger Robot
6172a98b2b Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 am: 423bcb4fbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01cfff4403d6e3499ae2608e34b9184b6358097f
2020-12-09 14:31:49 +00:00
TreeHugger Robot
79bf00aac3 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 am: 0b89867372
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadf73a6dac422ef24851c603a1e5cd1ab8c0dcf2
2020-12-09 14:31:38 +00:00
TreeHugger Robot
0b89867372 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81cd1495fd0beb356554d5a86daa30214d0d27d0
2020-12-09 14:03:32 +00:00
TreeHugger Robot
f49e9d2196 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36f99bfb1e5eee253bb4ce030d7000cb40c2ff63
2020-12-09 13:49:10 +00:00