Vania Januar
11603c5be9
Merge "Force enabling Notes role from developer options affects all users."
2023-04-14 09:24:44 +00:00
Treehugger Robot
3c5baf76f1
Merge "Fixes SelectLongPressTimeoutPreferenceControllerTest summary check." into udc-dev am: 5c8d1332c7 am: 872336e5a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22630556
Change-Id: I554a5639de10e868f8a6353f32e32af2c9d4bb81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 23:53:20 +00:00
Daniel Norman
5c6ba285b7
Fixes SelectLongPressTimeoutPreferenceControllerTest summary check.
...
This preference was updated in
commit 6c3805288b
to use "%s" summary and remove the controller's getSummary()
implementation so the old test that checked the controller summary
was failing.
This new version checks the preference's summary directly, but that
seems to require running using the robotest runner instead of unit test
so this test was moved there and now follows patterns used by other
similar tests there.
Fix: 278110568
Test: SelectLongPressTimeoutPreferenceControllerTest
Change-Id: Ib65c823a568ad200ebeae74ad443f32441e5cb73
2023-04-13 19:57:32 +00:00
Vania Januar
32aae36b37
Force enabling Notes role from developer options affects all users.
...
CP from ag/22598718 due to conflicts in downstream branch.
Bug: 276432652
Test: ForceEnableNotesRolePreferenceControllerTest
Change-Id: Ic0fa7f33dcb6509908008774c725eec386d0608b
2023-04-13 09:57:38 +00:00
Zaiyue Xue
6e606674ec
Merge "Support battery usage chart start index label is the detailed last full charge time" into udc-dev am: 4d737d7813 am: 07f3152ad2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22379150
Change-Id: Ic4820b148a0375c765f3bd36343c3017fc2b7960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 09:25:44 +00:00
Treehugger Robot
a50f75532a
Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev am: be76ebdc5b am: 758b0317ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552288
Change-Id: Ic5be47e2240a4ece4853a2e772142c0bdeea7f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 08:56:32 +00:00
Zaiyue Xue
bcafd5dfda
Support battery usage chart start index label is the detailed last full charge time
...
https://screenshot.googleplex.com/5dYp7kJpNPMU6Jx.png
https://screenshot.googleplex.com/7ZSbWyCGRFSym6A.png
https://screenshot.googleplex.com/9GsPTa9zd2XttDX.png
Bug: 271214926
Fix: 271214926
Test: manual
Change-Id: Ic869653f66866964f34e111dd2ee8c052313e119
2023-04-13 16:37:35 +08:00
Treehugger Robot
be76ebdc5b
Merge "Add Wi-Fi hotspot > Security Settings page" into udc-dev
2023-04-13 08:24:34 +00:00
Chaohui Wang
bade118967
Merge "Fix create bluetooth dialog repeatedly" into udc-dev am: 8313b6b0fb am: 3bed84baec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22572958
Change-Id: I3dd368195f69f0affdc14b6f7e259fac737ea3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 06:54:05 +00:00
Chaohui Wang
8313b6b0fb
Merge "Fix create bluetooth dialog repeatedly" into udc-dev
2023-04-13 06:02:16 +00:00
Varun Shah
582f0e130c
Merge "Update the default wellbeing package config." into udc-dev am: 4cf335d53c am: 1d00be1ad5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532865
Change-Id: If3aaeebba9ebde14a1a7f04a570a515b23b36234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 03:52:18 +00:00
Varun Shah
4cf335d53c
Merge "Update the default wellbeing package config." into udc-dev
2023-04-13 03:38:10 +00:00
TreeHugger Robot
ece31ef275
Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c am: f2e7f45fe6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807
Change-Id: I99703722ae243086389eab49563a715f7a7513c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 03:23:07 +00:00
YK Hung
f4d44bcfff
Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b56 am: 3c47574638
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573805
Change-Id: I8f7828fb51361ff560984b1de0320b234e7adb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:26:04 +00:00
Vania Januar
c7329bf42e
Merge "Add developer options to force enable Notes role." into udc-dev am: b79772ac3a am: a24e7dc12a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22459282
Change-Id: I836cfd095b654ef4b55abb1474a19cd4ced4f1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:20:27 +00:00
TreeHugger Robot
70ef00405c
Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev
2023-04-13 02:16:15 +00:00
Treehugger Robot
7afb2d4440
Merge "Remove unused MagnificationPreferenceFragment and its related controllers"
2023-04-12 19:33:30 +00:00
ykhung
836dc0d76c
Remove plug/unplug condition for the incompatible charging
...
Remove the plug/unplug condition checking for the incompatible
notification based on the feedback from:
https://b.corp.google.com/issues/276403405#comment3
Bug: 276403405
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Change-Id: Iec177ed33a3cc8cf5a5747b6f65440d31120823c
2023-04-13 00:29:11 +08:00
YK Hung
e4c3f68b56
Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev
2023-04-12 15:43:48 +00:00
Chaohui Wang
e13d644f2c
Fix create bluetooth dialog repeatedly
...
When the screen rotates, currently the startActivityForResult() within
RequestPermissionActivity could be called multiple times, so the
multiple RequestPermissionHelperActivity will be created, which caused
the issue.
Replace RequestPermissionHelperActivity with AlertDialog (as an
unfinished TODO of RequestPermissionHelperActivity) can fix this issue.
Fix: 243601277
Test: Manually with adb shell commands
Test: Unit test
Change-Id: If1e2b2807b69a87bbcfffa543ee0da134d4c4312
2023-04-12 18:34:52 +08:00
Weng Su
9f80cd2f77
Add Wi-Fi hotspot > Security Settings page
...
- Restrict low security type when 6 GHz band is selected
- Disable "WPA2/WPA3-Personal" security type
- Disable "WPA2-Personal" security type
- Disable "None" security type
- Automatically updated security type to WPA3 when 6 GHz band is selected
- Regenerate password when security type is changed from None
Bug: 245258763
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
WifiHotspotSecuritySettingsTest \
WifiHotspotSecurityViewModelTest \
WifiHotspotRepositoryTest
Change-Id: I31b08795419baed10dc40b876aeec175f6f41e69
2023-04-12 18:19:49 +08:00
Vania Januar
b79772ac3a
Merge "Add developer options to force enable Notes role." into udc-dev
2023-04-12 09:54:15 +00:00
Zaiyue Xue
a2ab3ae5b3
Small refactor battery usage code according to the comments in previous cls.
...
Bug: 262802531
Test: presubmit
Change-Id: I0d496fc6a41af5964311dafe8dd89f8b8058de82
2023-04-12 17:24:16 +08:00
Chris Antol
ec65b5076e
Merge "Make Tips & Support page launchable from Settings Search results" into udc-dev am: 5336f758d2 am: 49da028eb0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22579945
Change-Id: Ie7f7b4f1dc979da58249741fe2cba8ffdf88ca38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 08:13:59 +00:00
Quang Luong
7765d8f0e3
Merge "Don't overwrite security params when editing saved config" into udc-dev am: ba74d65523 am: bff112fe67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22439593
Change-Id: I6712458191ae8651b3a20605876350bf72af7eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 08:13:46 +00:00
Chaohui Wang
4388e217d8
Merge "Display App installed in other user in All Apps" into udc-dev am: 4c1e924442 am: 03e8ebc4dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22546422
Change-Id: Ifa44a57f688fcbac11a4c77942a74d1cabc395ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 06:04:32 +00:00
Chun-Ku Lin
b7d513b84d
Remove unused MagnificationPreferenceFragment and its related controllers
...
Bug: 277258376
Bug: 270481978
Test: manually on Pixel & AOSP
Change-Id: I1e0bbecf78290b85e464a4a5de658184eb91ca2c
2023-04-12 00:51:45 +00:00
Chris Antol
5336f758d2
Merge "Make Tips & Support page launchable from Settings Search results" into udc-dev
2023-04-12 00:04:36 +00:00
Quang Luong
ba74d65523
Merge "Don't overwrite security params when editing saved config" into udc-dev
2023-04-11 22:45:43 +00:00
Chris Antol
b8ed22bb4e
Make Tips & Support page launchable from Settings Search results
...
Bug: 258315425
Test: Tested on pixel device: in Settings search bar, enter "Tips" then tap the result for Tips & Support -> verify Tips and Support page is launched
Change-Id: I30e52f5498fbeb840e7448fa464c20649f0b1db5
2023-04-11 21:08:05 +00:00
Vania Januar
bf4119b4b5
Add developer options to force enable Notes role.
...
The Notes role is enabled through a RRO that overlays the config
config_enableDefaultNotes (and its work profile counterpart).
Bug: 276432652
Test: ForceEnableNotesRolePreferenceControllerTest
Change-Id: Iab05b6c13dabda94c513919365a3a9f69dacb80e
2023-04-11 13:05:07 +00:00
Chaohui Wang
4c1e924442
Merge "Display App installed in other user in All Apps" into udc-dev
2023-04-11 04:02:39 +00:00
Hao Dong
40d69e3ce5
Merge "Show a dialog preventing face enrollment in split mode." into udc-dev am: 22c608be4d am: a27d94d75d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22460413
Change-Id: I25f7d00d306b00b1c144d4f1e12478d3276f379d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-10 19:45:32 +00:00
Chaohui Wang
c688f93ed9
Display App installed in other user in All Apps
...
Only for admin user.
Also clean up unused getInstallationStatus().
Fix: 277299765
Test: Manually with All Apps when multiple users is on
Test: Unit test
Change-Id: I4de681c101a605e3517dcd8765bf7a95d1b76417
2023-04-10 03:06:01 +08:00
Hao Dong
64277a23bb
Show a dialog preventing face enrollment in split mode.
...
Test: atest CombinedBiometricProfileSettingsTest
Test: atest FingerprintSettingsFragmentTest
Test: manaul test- go to split screen mode and try to enroll
face
Bug: 276938441
Change-Id: I45e859b453700aa79f7774fb5deda81b1f30e5a5
2023-04-07 21:53:52 +00:00
Florian Mayer
fd9c686cd9
Merge "Move bootloader_override property" into udc-dev am: f58ea4671e am: ab14241e64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22234234
Change-Id: I8c841b5198babacd18ca85c581992ff89e3600a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 21:25:50 +00:00
Florian Mayer
f58ea4671e
Merge "Move bootloader_override property" into udc-dev
2023-04-07 20:06:25 +00:00
Varun Shah
4a5e0e5bc7
Update the default wellbeing package config.
...
defaultWellbeingPackage is now deprecated and should not be used.
Instead, point all references to the new systemWellbeing config.
Bug: 233363529
Test: atest AmbientDisplayAlwaysOnPreferenceControllerTest
Test: atest DarkModeCustomBedtimePreferenceControllerTest
Test: atest DarkModeScheduleSelectorControllerTest
Test: atest WhenToDreamPreferenceControllerTest
Change-Id: Ia55ce505c5010e401ec0dc18a2fed41d3a692c7a
2023-04-07 19:55:19 +00:00
Florian Mayer
1ef1073694
Move bootloader_override property
...
Bug: 274953227
Change-Id: I391329a14a5dda741103bd0097fee65ea97c866a
2023-04-07 18:32:30 +00:00
Roshan Pius
21f0ad2839
Merge changes I8a6f01ab,I1b8c06a0 into udc-dev am: 7a49bfe6b0 am: 5e7e88a4b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22482405
Change-Id: I43d03ef8235cfd1ebc2495b6148c97ad2958e92e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 16:52:03 +00:00
Roshan Pius
7a49bfe6b0
Merge changes I8a6f01ab,I1b8c06a0 into udc-dev
...
* changes:
settings(uwb): Show message when UWB is unavailable due to regulatory
settings(uwb): Refactor UwbPreferenceController
2023-04-07 16:03:48 +00:00
Roshan Pius
6fc40046a3
settings(uwb): Show message when UWB is unavailable due to regulatory
...
Bug: 270515435
Test: Manual tests
Test: atest UwbPreferenceControllerTest
Change-Id: I8a6f01aba237234fe88e42ba338a1df02623f7da
2023-04-06 11:34:15 -07:00
Roshan Pius
95892f3394
settings(uwb): Refactor UwbPreferenceController
...
1. Use handler executor to directly handle state changed callbacks in
the same thread as APM handling.
2. Use the same flow to fetch the initial APM mode & UWB state from
onStart()
3. Store the state and reason code (to be used for showing regulatory
message in follow up CL).
4. Refactor the class for better unit testing (use mocks, avoid reaching
into class members being tested by using argument captor).
Bug: 270515435
Test: Manual tests
Test: atest UwbPreferenceControllerTest
Change-Id: I1b8c06a05691d9512de65ca2d61f3963dab230ab
2023-04-06 11:34:08 -07:00
Darrell Shi
ed05a003f2
Merge "Hide timeout to user0 pref when switching blocked." into udc-dev am: 7242e7bb86 am: b3b0ec6811
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22391043
Change-Id: Ic87f0a316ddf494b6b470153b5ba7dba5c52d4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 16:16:00 +00:00
Darrell Shi
7242e7bb86
Merge "Hide timeout to user0 pref when switching blocked." into udc-dev
2023-04-06 15:22:25 +00:00
TreeHugger Robot
210c11be5f
Merge "Fix b/276423111: Keep unchanged perferences in the app list instead of clear all." into udc-dev am: 56c16c247f am: f731e8a685
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22472426
Change-Id: I726d9773827a7cce9528d2a0a95cb4e8ce1bd08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 14:06:21 +00:00
TreeHugger Robot
56c16c247f
Merge "Fix b/276423111: Keep unchanged perferences in the app list instead of clear all." into udc-dev
2023-04-06 13:05:52 +00:00
Zaiyue Xue
c616a65144
Fix b/276423111: Keep unchanged perferences in the app list instead of clear all.
...
Bug: 276423111
Bug: 269203672
Fix: 276423111
Fix: 269203672
Test: manual
Change-Id: Ie2cb668ae4c46f5c40eed555510be034be45d713
2023-04-06 19:54:40 +08:00
TreeHugger Robot
f4da7e1cf5
Merge "settings(nfc): Remove reference to APM setting in NFC page" into udc-dev am: 7a1d2177d8 am: c01148716b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339508
Change-Id: I8c2af9d23fe6f71f620653f5d7d08a7940596e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 11:37:55 +00:00
TreeHugger Robot
7a1d2177d8
Merge "settings(nfc): Remove reference to APM setting in NFC page" into udc-dev
2023-04-06 10:49:32 +00:00