Betty Chang
59c5b1898f
Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946
Change-Id: I88a61967854113f8311297e116bcfe5dcdf57d9e
2021-07-01 09:35:42 +00:00
Betty Chang
8bf1d8bc1b
Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946
Change-Id: I00499ed64a2bf9aba573ae3b9cb8c05558f50f73
2021-07-01 09:35:15 +00:00
Tom Hsu
6e2fd0f451
Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa am: a3852ffc75 am: 2c93cf007f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685
Change-Id: I4539b0a89291b1f5454617f4403cd7ecf3196943
2021-07-01 09:13:04 +00:00
Alex Johnston
0bea66384f
Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28 am: ab4f1de8f3 am: 2da4e0f94d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296
Change-Id: I059acaab0fc001f443380dfab71a2a888b8a6ed0
2021-07-01 09:12:58 +00:00
Wesley Wang
933f643e98
Merge "Update high usage tips string" into sc-dev am: ddc8a5db98 am: 15d004a5b8 am: 25c3524f59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303
Change-Id: I28af0d8fd754b51cdfeb05d5e1e2a62179cd9314
2021-07-01 09:12:53 +00:00
Tom Hsu
e0dd17f437
Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa am: 9a072482ec am: e58306ee13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685
Change-Id: I14cc28e70db522a9c48ede06807b5e1d8f7a439e
2021-07-01 09:12:47 +00:00
Alex Johnston
0f95324a17
Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28 am: 4055c9b50a am: 317ff89372
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296
Change-Id: I35ed9a02879e29fbe4029aceb59629c41572ba5a
2021-07-01 09:12:41 +00:00
Wesley Wang
be739a83f1
Merge "Update high usage tips string" into sc-dev am: ddc8a5db98 am: dccdce75bb am: be48e4bfcf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303
Change-Id: Ie5b526f32aabd2325eec37873c6b4d7f4305a160
2021-07-01 09:12:34 +00:00
tom hsu
58d100c3a0
[Settings] Prevent crash from abnormal behavior for ApnSettings page.
...
- The problem is user remove SIM when stop in ApnSettings page, and do
unexpected operation.
- To figure out this problem, listen SIM absent event and make activity
finish at this moment.
Bug: 189909956
Test: Manual test.
Merged-In: I179c708debcbc31ba9a93e4e434ae810051f5004
Change-Id: If59f68f595794695600811224cdedb4692b869c0
2021-07-01 17:10:56 +08:00
Jason Chang
d9a4197d9d
Change One-handed mode controls states in the Settings pages for
...
improving better UX experience
According to UX feedback to adjust One-handed mode UI
controls’ status in the Settings page for better UX experience.
Bug: 192171369
Test: manual verified on Settings > System > Gesture page
> System controls page
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedMainSwitchPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedActionPullDownPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedActionShowNotificationPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedPreferenceCategoryControllerTest"
Change-Id: I76242fe70c3ec06cd5e2f9bb059c87293cc686dd
2021-07-01 17:05:27 +08:00
TreeHugger Robot
69e246ab89
Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev
2021-07-01 09:02:39 +00:00
Mill Chen
aaa031bd71
Correct the choose screen lock page
...
The choose screen lock page didn't apply the right theme during the
enterprise flow. That is because an intent extra of setup wizard wasn't
properly passed to the next page. In this change we made sure the intent
extra is able to properly pass to the next page.
We also removed the wrong theme for setup choose a screen lock page
since the wrong theme made this page broken. The setup choose a screen
lock is a sub setting page that wasn't implemented by using SUW library,
so it should not use GlifLayout theme. With this update, the choose a
screen lock page still keeps the background color of Settings, that is
different from the one of setup flow.
Bug: 190499041
Test: manual test
Change-Id: I9dceee6a398c7e7b487dd8e4046f71f76cc50e36
2021-07-01 16:54:00 +08:00
Betty Chang
60d2057417
Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev
2021-07-01 08:53:10 +00:00
Tom Hsu
2c93cf007f
Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa am: a3852ffc75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685
Change-Id: Ie6cfaf5fe8bddce37dab6216932d1a46c460aba1
2021-07-01 08:46:31 +00:00
Alex Johnston
2da4e0f94d
Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28 am: ab4f1de8f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296
Change-Id: I445f68862ca110ab8cf4a38fd1c2e815fd6dfb76
2021-07-01 08:46:27 +00:00
Wesley Wang
25c3524f59
Merge "Update high usage tips string" into sc-dev am: ddc8a5db98 am: 15d004a5b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303
Change-Id: I96c42bb454176a0d1c51f63fb9cc5b323cf5b416
2021-07-01 08:46:11 +00:00
Tom Hsu
e58306ee13
Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa am: 9a072482ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685
Change-Id: I8ae83555f74b40302cadee0a7967936a62b276a9
2021-07-01 08:46:02 +00:00
Alex Johnston
317ff89372
Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28 am: 4055c9b50a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296
Change-Id: I55d67ab19ae78c853ba083995e625ceaff341444
2021-07-01 08:45:58 +00:00
Wesley Wang
be48e4bfcf
Merge "Update high usage tips string" into sc-dev am: ddc8a5db98 am: dccdce75bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303
Change-Id: If93586d489a0cef3cf0cf0199db90ed265b40e80
2021-07-01 08:45:47 +00:00
Tom Hsu
cb91eef63a
Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa am: c951604e5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685
Change-Id: Ic64abd0fbf3d8d38c402bb91f6417ccec4efd41a
2021-07-01 08:45:29 +00:00
Alex Johnston
248ae04a22
Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28 am: 486cbe6311
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296
Change-Id: I48919238a5b90350b2787aa78690ef81b95c648e
2021-07-01 08:45:22 +00:00
Wesley Wang
6e08e02adb
Merge "Update high usage tips string" into sc-dev am: ddc8a5db98 am: 38c4b3d1b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303
Change-Id: I23cb3f721c985549710e3cedcaf20d6ef55b4766
2021-07-01 08:45:15 +00:00
Tom Hsu
9a072482ec
Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685
Change-Id: Ie5748b5a7829dc2bb2b86954c3815a03badc120e
2021-07-01 08:33:39 +00:00
Alex Johnston
4055c9b50a
Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296
Change-Id: I835cc2dbc956bd53b10acc2c73b0de9069bc740c
2021-07-01 08:33:34 +00:00
Wesley Wang
dccdce75bb
Merge "Update high usage tips string" into sc-dev am: ddc8a5db98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303
Change-Id: I1fb9bac630efc5d6e617e38b40728b94ff0073b3
2021-07-01 08:33:28 +00:00
Tom Hsu
c951604e5f
Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685
Change-Id: I50a5b75662943db9735b24aca9901e34de2ff537
2021-07-01 08:32:53 +00:00
Tom Hsu
a3852ffc75
Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685
Change-Id: I019ad9d7712f15f1aa4ce548cde7a60cc8b283c4
2021-07-01 08:32:51 +00:00
Alex Johnston
ab4f1de8f3
Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296
Change-Id: I5b7855ecd5a5fe647deb6dd2df06dd5c803a5f38
2021-07-01 08:32:46 +00:00
Alex Johnston
486cbe6311
Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296
Change-Id: I04d07829b96c3b333d2f40b3a9d03741af85cbdb
2021-07-01 08:32:46 +00:00
Wesley Wang
38c4b3d1b0
Merge "Update high usage tips string" into sc-dev am: ddc8a5db98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303
Change-Id: I8f6a1f8cdb11ba2886f3d04f1bace113c78e08d7
2021-07-01 08:32:41 +00:00
Wesley Wang
15d004a5b8
Merge "Update high usage tips string" into sc-dev am: ddc8a5db98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303
Change-Id: I45d64bd2ae2014c89092635ca71528955f0e6883
2021-07-01 08:32:38 +00:00
Tom Hsu
f5a55229fa
Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev
2021-07-01 08:28:15 +00:00
Alex Johnston
4174cf1b28
Merge "Fix Settings usb preference search" into sc-dev
2021-07-01 08:26:51 +00:00
Wesley Wang
ddc8a5db98
Merge "Update high usage tips string" into sc-dev
2021-07-01 08:22:11 +00:00
Jason Chiu
604a803b4e
Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: d24ee9c0ad am: e1de78a270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234
Change-Id: I92de90842c61b32669ae9f52e01f74496eda2949
2021-07-01 07:54:52 +00:00
Jason Chiu
b06fc98859
Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: ab902d4d84 am: 0ee32dcd2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234
Change-Id: I750b5d50b3fbdd7153aea85d7df36f0bce4e3715
2021-07-01 07:54:45 +00:00
Jason Chiu
ae1fc0dada
Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: 8cdbad13e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234
Change-Id: I741bfd7d164924d30f32ab0567bdcd85875e35d3
2021-07-01 07:50:05 +00:00
Wesley.CW Wang
15ca9a632f
Update filter logic for BatteryDiffEntries
...
- Use user id and package name to query the battery entry list instead of uid, to handle the
cases which enter app info page without uid like launch icon -> app
info
Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I665e57ff3eabf23485455fb2e1af2e0376af1e40
2021-07-01 15:48:23 +08:00
Jason Chiu
e1de78a270
Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: d24ee9c0ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234
Change-Id: I189c81e167c158a513bc4e0df8e9c4f039057ccb
2021-07-01 07:42:40 +00:00
changbetty
767681812b
Set the attribute of the dialog window for overlay QS internet panel
...
Bug: 190460969
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialog2Test
Change-Id: I1acdfb09393163bb94824fe2b3bad0391ba4fb53
2021-07-01 07:41:11 +00:00
Jason Chiu
0ee32dcd2b
Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: ab902d4d84
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234
Change-Id: Ie292d02ec2bb04aaa903d64003bedf8416c207f2
2021-07-01 07:37:26 +00:00
Jason Chiu
8cdbad13e6
Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234
Change-Id: I198d2557bbd966d105e7a8daf8665b3a10d26536
2021-07-01 07:36:50 +00:00
Jason Chiu
d24ee9c0ad
Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234
Change-Id: I9f806b71618c2447ddf9ad2322f9971ea3b1d89c
2021-07-01 07:25:42 +00:00
Jason Chiu
ab902d4d84
Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234
Change-Id: I14b3f1890c9b278f21e781c2a9348d57528e8b29
2021-07-01 07:24:42 +00:00
Jason Chiu
a460e4f890
Update title and subtext of Contact search in Work profile settings
...
Test: visual
Bug: 184610902
Change-Id: I5391ce3c1dc4aef6ec9e840f382d74a6a399e562
2021-07-01 07:22:40 +00:00
Jason Chiu
1f4eb8fbcc
Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev
2021-07-01 07:10:56 +00:00
changbetty
b453e44bf8
Add Adaptive Connectivity switch on/off string for fixing string gender
...
Bug: 189234188
Test: Manual test
Change-Id: I8a3df2a0f4b364e4bc31e0efd116312b5fdf3b42
2021-07-01 14:57:52 +08:00
Mill Chen
e24255fe7e
Fix multiple biometrics enrollment flow
...
Suppose both face auth and fingerprint auth exist in a device, the setup
flow will skip fingerprint enrollment when a user skips to register
face data on the face enrollment education page. Updated the skip button
method and make the flow move on to fingerprint enrollment if a use
doesn't want to register face data.
Fix: 186084024
Test: manual verified
1) Reset device and start from SUW
2) Press skip button on the face unlock education page
3) The next flow should be fingerprint enrollment intro page
Change-Id: I037ae68f39f5fdbf62ea95b998621c7f7df31b43
2021-07-01 14:45:33 +08:00
tom hsu
a8456b4aa9
[Settings] Make UI be able to update current status, after SIM absent.
...
- The cache of default data subscription id does not update when SIM
absent. Therefore, uses getActiveSubscriptionIdList instead current to
make it more precise.
Bug: 192032602
Test: Manual test. see b/192032602#7
Change-Id: I29e697e97d32ecb2e93c9620ec65215f963e4ebe
2021-07-01 05:35:46 +00:00
TreeHugger Robot
7a108c2d01
Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c am: dfb8409116 am: 325a4da467
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430
Change-Id: Ifea0933ba36e56ce1de25816b8d56557ae965e7b
2021-07-01 03:27:17 +00:00