Commit Graph

56218 Commits

Author SHA1 Message Date
Bonian Chen
f5557102c9 Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387129

Change-Id: I84e8bf96b0d58f5833e00effaee52e120f77fa98
2020-08-05 04:57:19 +00:00
Bonian Chen
144e2b41f5 Merge "Remove logic to manually search inactive pSIM." 2020-08-05 04:39:45 +00:00
Malcolm Chen
3805373f90 Remove logic to manually search inactive pSIM.
Nowe inserted inactive pSIM will be included in Telephony's get
available and get selectable subInfo list so that logic is no longer
needed.

Bug: 147128878
Test: unittest
Merged-In: Icd131f133e47dae0770a4da71c51de3c2a94b42b
Change-Id: I9ba5dded7817116c02d70298c9c271ff6a99925b
2020-08-04 18:57:37 +08:00
Bonian Chen
603dcc1856 Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387124

Change-Id: Id886131d82e274572e4277ed8d8f0f61513a8d65
2020-08-04 10:41:58 +00:00
Bonian Chen
6a4d09c4ed Merge "mainline: remove CarrierConfigManager.init" am: eff795f061
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387120

Change-Id: I79a3a67123c110eb2ccbba5c0e54598bcc99c86e
2020-08-04 10:41:43 +00:00
Bonian Chen
9057a78bfa Merge "[Settings] Avoid crash when switch SIM during PIN lock" 2020-08-04 10:37:12 +00:00
Bonian Chen
eff795f061 Merge "mainline: remove CarrierConfigManager.init" 2020-08-04 10:20:18 +00:00
SongFerngWang
87af2abc83 mainline: remove CarrierConfigManager.init
Bug: 147469789
Test:  make RunSettingsRoboTests ROBOTEST_FILTER=\
ApnPreferenceControllerTest (PASS)
make RunSettingsRoboTests ROBOTEST_FILTER=\
CarrierPreferenceControllerTest (PASS)
Merged-In: I2a72d409574fc281e5de57d58a27551dd040d551
Change-Id: I2535275d116887ed4b107fc530c85b4cbc5ad0d5
2020-08-04 10:18:54 +00:00
Bonian Chen
7940c0253f [Settings] Avoid crash when switch SIM during PIN lock
PIN lock status are stored without subscription ID mapping on it.
Which makes SIM status change can't be processed correctly.

Through storing the subscription ID for PIN lock screen, dialog can be
reset when SIM status changed and crash can be avoided.

Bug: 155852345
Test: manual
Merged-In: Ic520bc34c5a460b4fcd199cd524b180d307e9ab4
Change-Id: I8137c1e4d8f7f9d0e8d201fc9b7e277871ef5add
2020-08-04 17:44:42 +08:00
Bonian Chen
37e8cf45fd Merge "[Settings] Update EID in background" am: 1efdd7d3ba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385023

Change-Id: I0a880b06d2c2181789562e3e8476603a986d2746
2020-08-03 09:06:18 +00:00
Bonian Chen
8ff7f44b2d Merge "[Settings] Avoid from crash" am: fdb57510cd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385026

Change-Id: Ib83865b6248d6b3dcc4426a0a9729c8a76c1c0c2
2020-08-03 09:06:05 +00:00
Bonian Chen
c5d5a3d196 Merge "[Settings] Refactor for performance" am: 14b0af4343
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385025

Change-Id: I765d2c1c76199e9cb108ef18e85e5cb211f61009
2020-08-03 09:05:47 +00:00
Bonian Chen
1efdd7d3ba Merge "[Settings] Update EID in background" 2020-08-03 08:34:07 +00:00
Bonian Chen
fdb57510cd Merge "[Settings] Avoid from crash" 2020-08-03 08:33:47 +00:00
Bonian Chen
14b0af4343 Merge "[Settings] Refactor for performance" 2020-08-03 08:33:30 +00:00
Bonian Chen
342a1b9965 Merge "[Settings] Allow talkback to focus and select APN" am: 35be6641af
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385022

Change-Id: I88526fd4d865e62a5bc08321810830c736fd4369
2020-08-03 05:45:45 +00:00
Bonian Chen
1497df600b Merge "[Settings] Learn more link should be removed when not supported." am: ec42c98e8b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385020

Change-Id: I51ec6ca9199a44c4107b9308036fbc309c4af446
2020-08-03 05:45:33 +00:00
Bonian Chen
4ee1d08534 Merge "[Settings] WEA title wording change" am: 03ddb58767
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385021

Change-Id: I2233d2e1595d9e088c9b652200477f09ce87b601
2020-08-03 05:45:19 +00:00
Bonian Chen
35be6641af Merge "[Settings] Allow talkback to focus and select APN" 2020-08-03 05:25:43 +00:00
Bonian Chen
ec42c98e8b Merge "[Settings] Learn more link should be removed when not supported." 2020-08-03 05:25:20 +00:00
Bonian Chen
03ddb58767 Merge "[Settings] WEA title wording change" 2020-08-03 05:25:01 +00:00
Bonian Chen
2aba7f043e Merge "Hide sliceView if Slice is null" am: 811d654a6d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385016

Change-Id: Iffeb4e5ded6ebda5680b04afe83abd0803fb3d57
2020-08-03 03:22:43 +00:00
Bonian Chen
811d654a6d Merge "Hide sliceView if Slice is null" 2020-08-03 03:05:03 +00:00
Bonian Chen
fdb3a35efe [Settings] Avoid from crash
Avoid from crash when updateState() performed before
displayPreference().

Bug: 141833767
Test: make RunSettingsRoboTests -j
ROBOTEST_FILTER=ApnPreferenceControllerTest

Merged-In: I4008010077c61930487fef01af306ccdfd69e38f
Change-Id: Ic6421532d5435a577f765f23a69681bb9b8a1bd0
2020-08-02 22:50:06 +08:00
Bonian Chen
570d5441d3 [Settings] Refactor for performance
Refactor DataDuringCallsPreferenceController in order to reduce the time
spend on constuct and initialize DataDuringCallsPreferenceController.

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataDuringCallsPreferenceControllerTest
Merged-In: I484cafa739f9e6e58427894712f2bb7e2ed1f4ff
Change-Id: Id4947606a4919f06ae5ed6ddedd02399a2ee930f
2020-08-02 22:44:11 +08:00
Bonian Chen
44bc04a137 [Settings] Update EID in background
Access EID in background thread to avoid blocking UI.

Bug: 153407357
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Merged-In: Id30851bbd0b0fe080ed703586f9718be8b97abdd
Change-Id: I23fc6168d939bb5cb5e281413462176e7221819c
2020-08-02 22:38:13 +08:00
Bonian Chen
5331b6589b [Settings] Allow talkback to focus and select APN
Change the focus area to help talkback focus on APN items.

Bug: 149794675
Test: manual
Merged-In: I5f391be89a5b22095d6f0d04b187ea18970f18d4
Change-Id: I6d2d1624c5946a30b59343de06de6f79adf24011
2020-08-02 21:36:49 +08:00
Bonian Chen
1c5431bf23 [Settings] WEA title wording change
The wording of WEA need to align in UI entry and UIs within.
The "Wireless Emergency Alerts" should be the official wording for it.

Bug: 158498436
Test: build pass
Merged-In: I17e6659915e1038c8ab11ad4003c08f87bbdb82e
Change-Id: I4c1c4009287092703669f89981fd017ce605d4fe
2020-08-02 21:30:32 +08:00
Bonian Chen
fed54f7dc4 [Settings] Learn more link should be removed when not supported.
Learn more wording with link only help people when configured.
When no link available, these wording had better removed to avoid from
confusing people.

Bug: 159510116
Test: manual
Merged-In: I36b74b2b4586546090fb88562e8f4f052a877709
Change-Id: If7061e0be201b2f98964a7b0eec42cc17cb11ae3
2020-08-02 21:14:25 +08:00
Raff Tsai
53cbfe28bb Hide sliceView if Slice is null
Fixes: 142035673
Test: robolectric, visual
Change-Id: I2b5b34d068ba4590f65a284d4f62a1cc77f9666f
Merged-In: I2b5b34d068ba4590f65a284d4f62a1cc77f9666f
2020-08-02 12:26:10 +00:00
Treehugger Robot
4d421a47dc Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789

Change-Id: I02ccfae146dd0e360fa34592a3bb21f5c2501833
2020-07-29 08:07:46 +00:00
Treehugger Robot
7df1fb2af1 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 07:47:02 +00:00
Treehugger Robot
f130a08d5e Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: If0c4119754ddb20c9dab6e6a3221ef2898c34c55
2020-07-29 06:13:21 +00:00
Treehugger Robot
2c5a28bb2d Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 05:51:09 +00:00
Treehugger Robot
95773b6f1a Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: I8470490508ae353636146d760564449938999daa
2020-07-29 02:23:46 +00:00
Treehugger Robot
da02fb34b7 Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: I9ceecd654f6ac6403d46b8287c18afe6994fc953
2020-07-29 02:23:33 +00:00
Treehugger Robot
ba534426bf Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 02:22:28 +00:00
Treehugger Robot
c0d28b0f96 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 02:09:58 +00:00
Curtis Belmonte
5612e2c5c7 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: Ib5f445c3987c6eda2c3f3be8b9ac641c4e7f934e
2020-07-28 20:23:05 +00:00
Curtis Belmonte
1e8c7905a2 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: I4ecfd2d806314e7dc3bbff00849ad4be6f81d506
2020-07-28 20:16:03 +00:00
Curtis Belmonte
bd8f120e95 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: I89dbc737c62a796d3622cf17437f9eac930c99b3
2020-07-28 20:12:49 +00:00
Curtis Belmonte
1aa03da058 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Change-Id: I25b5f8a2d87d8754e6536d24f986ab90a2bc69fe
Test: Presubmit
Bug: 161896447
2020-07-28 20:08:17 +00:00
Treehugger Robot
3366290e20 Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268

Change-Id: Icebef90c2b18b36e5112d94aae02ae770ab300d3
2020-07-28 19:05:02 +00:00
Treehugger Robot
ed7662f6f6 Merge "BluetoothPairingRequest: Add null check for action" 2020-07-28 18:51:00 +00:00
Treehugger Robot
ef56fb20c3 Merge "More inclusive language." am: 4be2b5c2f6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: I4848004145a681e49a75a3f2d6e267b32c424585
2020-07-28 10:42:13 +00:00
Treehugger Robot
4be2b5c2f6 Merge "More inclusive language." 2020-07-28 10:25:10 +00:00
Alan Stokes
cd2c453cbd More inclusive language.
Test: Builds
Bug: 161896447
Change-Id: Ie4d64dca9f4720eea532b534162e47ed81aea03b
2020-07-27 18:21:56 +01:00
Chen Chen
fc7b6693ee BluetoothPairingRequest: Add null check for action
Bug: 159728132
Test: Build

Change-Id: I24668e20accf96c7469c9e1ab589b1383ab59d18
Merged-In: I24668e20accf96c7469c9e1ab589b1383ab59d18
(cherry picked from commit 1805f666e7)
2020-07-24 14:54:35 -07:00
Anton Hansson
7fe08c1923 Merge "Add explicit dep on ims-common" am: 0f6b2ec233
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1370159

Change-Id: I4a02bab9e52768605891f076f504256b3198fa4a
2020-07-22 16:11:05 +00:00
Anton Hansson
0f6b2ec233 Merge "Add explicit dep on ims-common" 2020-07-22 15:55:41 +00:00