Wesley Wang
427a265713
Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c
am: 6fc0fcdf57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916
Change-Id: Ib46317dc6ad809ce05ce378247ab008d38b8b99a
2021-07-01 10:57:30 +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
TreeHugger Robot
8ea6f6382e
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: I51f27def0f935eba855bf711aa961b1b4f8c33ae
2021-07-01 10:38:41 +00:00
TreeHugger Robot
e8a6ddc02b
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: If658ebeb08b49494eea84a54d71cc72cf093dbdd
2021-07-01 10:38:41 +00:00
Wesley Wang
6fc0fcdf57
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: I4bc7ddcbf5b397d4c07e64c80e23b0e792043d72
2021-07-01 10:38:33 +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
166d2e3609
Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89
am: 19997e4f18
am: 27d933ed22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543
Change-Id: Ib346dfce7648721271e1c2e610ed4c6e4bd85944
2021-07-01 10:28:39 +00:00
Automerger Merge Worker
7ac9a4e59c
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 am: d4005a11d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946
Change-Id: Iff332afabd8ff04d7e2cd027c56062f2df43c225
2021-07-01 10:28:17 +00:00
TreeHugger Robot
a0b10929b1
Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89
am: b58a2527b7
am: 08c4018153
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543
Change-Id: Id0729232b7f0365f3c659f0e4f7efc9406ac2ab3
2021-07-01 10:27:57 +00:00
Betty Chang
140a88baa6
Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417
am: 4414631723
am: fa868058b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946
Change-Id: Iaa332e9fd56f842a33bf631b889492b4abd9d50d
2021-07-01 10:27:09 +00:00
Betty Chang
ac621ef76c
Merge "Set the attribute of the dialog window for overlay QS internet panel"
2021-07-01 10:13:19 +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
017ff60a19
Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89
am: 1150684841
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543
Change-Id: I06ff6aa68c1a243f35710ae9f95530de0a2810d3
2021-07-01 09:51:35 +00:00
Betty Chang
b0d197b002
Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417
am: 8bf1d8bc1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946
Change-Id: I4a162c7a407bb45841a2c32398ba3de4c7929b09
2021-07-01 09:51:18 +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
1150684841
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: I97a7889809b2f1f9dadf6fc6e700dd90b8eff202
2021-07-01 09:37:13 +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
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
Ahaan Ugale
239b58e60a
Autofill settings: Fix search
...
Ia012232ba2856e0757289982bc3045d948ff4aa8 replace the "Autofill service"
preference title with the earlier summary string. The change in title
causes search to not find the preference anymore. This change adds back
the title in xml, which makes search find it again. The Controller code
still overwrites the title with the application name.
Also fixes DefaultAutofillPreferenceControllerTest.
Bug: 192403526
Test: manual - clear Settings Services storage -> search "fill" -> click
link
Test: make -j64 RunSettingsRoboTests \
ROBOTEST_FILTER="com.android.settings.applications.defaultapps.DefaultAutofillPreferenceControllerTest"
Change-Id: I9714b3efd2a5a7d9ee7eef345415fa020ef0dc61
2021-07-01 01:58:29 -07: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