Wesley Wang
ddc02bb7c4
Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c
am: 72ffa64746
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916
Change-Id: Ic3b0175739873746113d8bb693506f1546b84ee4
2021-07-01 10:58:28 +00:00
TreeHugger Robot
f224fdee29
Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071
am: e2b32bceab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467
Change-Id: Iee997b0a3943015e1a60d10757827e82c2728194
2021-07-01 10:58:15 +00:00
Wesley Wang
8a60294b26
Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c
am: e71e0176f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916
Change-Id: I9619130bdbdb250d51b51988af308ee4cbf42c2a
2021-07-01 10:57:59 +00:00
TreeHugger Robot
e2b32bceab
Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467
Change-Id: Idd4de9fb3c9a7d9e97ed54e1fe35d3ce88779a2a
2021-07-01 10:39:25 +00:00
Wesley Wang
e71e0176f0
Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916
Change-Id: If4b2d991ddd95391b987246e40a6b34a5cd5b958
2021-07-01 10:39:16 +00:00
Wesley Wang
72ffa64746
Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916
Change-Id: I625f8890a705d6ad0ba3afeca243607a150a1b17
2021-07-01 10:38:29 +00:00
TreeHugger Robot
150ed0b071
Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev
2021-07-01 10:09:08 +00:00
Wesley Wang
a6a4fe474c
Merge "Update filter logic for BatteryDiffEntries" into sc-dev
2021-07-01 10:05:38 +00:00
TreeHugger Robot
27d933ed22
Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89
am: 19997e4f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543
Change-Id: I711aa4aa7ca2c0f22fa5051623e3e39daa87c21d
2021-07-01 09:52:35 +00:00
Automerger Merge Worker
d4005a11d0
Merge "Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417
am: 59c5b1898f" into sc-v2-dev-plus-aosp
2021-07-01 09:52:20 +00:00
Betty Chang
8f2de6f092
Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417
am: 59c5b1898f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946
Change-Id: I584300e62d0cf343373d5c16a89c80e93076ea71
2021-07-01 09:52:16 +00:00
TreeHugger Robot
08c4018153
Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89
am: b58a2527b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543
Change-Id: I83863100def288efc12a0a1e575b0102e7349ff0
2021-07-01 09:52:14 +00:00
Betty Chang
fa868058b2
Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417
am: 4414631723
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946
Change-Id: Ie343bba241d3e643fa1d346723f9b070c7b8a930
2021-07-01 09:52:03 +00:00
TreeHugger Robot
b58a2527b7
Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543
Change-Id: I885a4ffa3d7cc3d416e45bfe20aaf5993857c2af
2021-07-01 09:37:57 +00:00
Betty Chang
4414631723
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: I0b2e424022ff77a13af0907b9dbc2723dcf055f9
2021-07-01 09:37:51 +00:00
TreeHugger Robot
19997e4f18
Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543
Change-Id: I1abc4d82a36c7b17f21d9a92967da049c87c8d37
2021-07-01 09:36:14 +00:00
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
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
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
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
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
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
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
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
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
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
325a4da467
Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c
am: dfb8409116
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430
Change-Id: I8c613a0fbed0331c83856c8ca502cd2ab636b895
2021-07-01 03:03:54 +00:00
TreeHugger Robot
0af4260cb3
Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c
am: 2ddfd5616d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430
Change-Id: I2ccdd29729b1cdfdf6189ca4137e70074bccbbc5
2021-07-01 03:03:29 +00:00
TreeHugger Robot
2ddfd5616d
Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430
Change-Id: I35fcc3939777cf9b62800a853c5e9746097fdc9b
2021-07-01 02:50:51 +00:00
TreeHugger Robot
dfb8409116
Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430
Change-Id: Ibf6c9652f206bc9803ffd56a6b3d5a651ea3d149
2021-07-01 02:50:00 +00:00
TreeHugger Robot
f421525d2c
Merge "Fix ManageApplications pinned header overlaps content" into sc-dev
2021-07-01 02:38:18 +00:00
Joe Bolinger
37b0e414ad
Prevent finishing early on single sensor devices. am: 47e8ddbdb9
am: de779f2883
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645
Change-Id: Id2c46bdd112f0255cf868fc0e1b3e00bea08b66e
2021-07-01 00:20:01 +00:00