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
7afb2d4440
Merge "Remove unused MagnificationPreferenceFragment and its related controllers"
2023-04-12 19:33:30 +00: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
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
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
Brian Lee
bd0b938ea6
Add RemoteLockscreenValidationFragment to help retain remote lockscreen am: 2eb8ed2488
am: 95178742b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22390454
Change-Id: Ib733e78ec419e9b4f36b7c8a49a0ffa37104025e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 22:15:02 +00:00
Brian Lee
2eb8ed2488
Add RemoteLockscreenValidationFragment to help retain remote lockscreen
...
validation state.
Currently, if ConfirmDeviceCredentialBaseFragment is ever re-created due
to orientation change, screen getting turned off, etc., relevant state
gets lost. This led to the old ConfirmDeviceCredentialBaseFragment
handling results which led to issues such as lockscreen not getting set.
By addiing a retained RemoteLockscreenValidationFragment,
we're able to update the new ConfirmDeviceCredentialBaseFragment
that will handle results. We can also retain other important state like
the device credential guess to be set after successful validation.
Some smaller changes include:
* If the activity is finished for any reason other than "Back" getting
pressed, RESULT_FIRST_USER is returned instead of RESULT_CANCELED.
* CheckBox, "Forgot [LSKF]?" button, and EditText/LockPatternView
gets disabled during validation.
* The above also stay disabled if ConfirmDeviceCredentialBaseFragment
gets re-created and remote lockscreen validation is still in progress.
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=com.android.settings.password
Test: Manual
Bug: 274983372
Bug: 274991889
Bug: 274792310
Bug: 270395807
Change-Id: Ib6d47430e233a43e6985ab83abae45713c49771f
2023-04-05 16:35:25 +00:00
Vania Januar
59070de15a
Merge "Fix broken test for stylus button Settings." into udc-dev am: a07ff94f83
am: 6a8a92254b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252124
Change-Id: I37bee0588e10e15eb15bdfd4207f8113ddde4782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 10:46:21 +00:00
Vania Januar
a07ff94f83
Merge "Fix broken test for stylus button Settings." into udc-dev
2023-04-05 09:46:25 +00:00
Lucas Dupin
24489fc790
Merge "Add contrast setting in dev options" into udc-dev am: 222a89acc1
am: ef4ca344b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425568
Change-Id: I7ec23652c8ddbe56f20b6d6ede2dbda87883c3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 03:19:18 +00:00
Lucas Dupin
222a89acc1
Merge "Add contrast setting in dev options" into udc-dev
2023-04-05 02:08:14 +00:00
Quang Luong
d6d560ff6e
Don't overwrite security params when editing saved config
...
WifiConfigController2 sets the security params of a saved config, which
may overwrite @hide fields like SecurityParams#mIsAddedByAutoUpgrade. To
prevent this, only set the security params for a new config, and use the
existing security params for existing configs.
Bug: 262312532
Test: atest WifiConfigController2Test
Change-Id: I9ef5eb8ce2b4208e1fad27bd68fc4f0fad7d1008
2023-04-04 00:55:13 +00:00
Hao Dong
2e31d34f69
Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev am: 5a2ba07f63
am: 70f4d50b2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361082
Change-Id: Icf2d8ff26f0c6e242271ddd494a69177b9342cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 22:54:47 +00:00
Hao Dong
005f214d54
Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev am: 637ae9d983
am: fc1fe263fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22078930
Change-Id: I6a0ac3df96141e23621f5c6d3f814c6f07fafd64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 22:52:33 +00:00
Hao Dong
5a2ba07f63
Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev
2023-04-03 21:14:37 +00:00
Hao Dong
637ae9d983
Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev
2023-04-03 21:06:40 +00:00
Hao Dong
ee8252b56b
Show a dialog preventing fingerprint enrollment in split mode.
...
Test: atest CombinedBiometricProfileSettingsTest
Test: atest FingerprintSettingsFragmentTest
Test: manaul test- go to split screen mode and try to enroll
fingerprint
Bug: 246247132
Change-Id: I12357d197f2ceda8c1f1f582cdecb20fd18e30f7
2023-04-03 18:02:22 +00:00
Candice Lo
b8206c85c9
Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev am: 470dbd6884
am: c96e19f819
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347809
Change-Id: I66795c6f016a705acdd20526b443e50f8f89cac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 02:57:51 +00:00
Candice Lo
470dbd6884
Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev
2023-03-31 23:17:48 +00:00
TreeHugger Robot
8248c8506f
Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev am: 8ae1abecc1
am: 7f278b5527
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22260969
Change-Id: I15550a1d82e80e11c313711851951c94329c25aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 22:56:42 +00:00
Darrell Shi
a86614db74
Hide timeout to user0 pref when switching blocked.
...
Do not show the "timeout to admin user" settings preference when user
switching is blocked on the current user, e.g. in demo mode.
Test: atest SettingsRoboTests:TimeoutToDockUserPreferenceControllerTest
Bug: 255277938
Change-Id: Ibd0944c69254000a453f477eb72a0ba5832e9793
2023-03-31 22:14:35 +00:00
Hao Dong
322df0454f
Show Class 3 consent screen in enrollment with strong face.
...
Test: atest FaceEnrollIntroductionTest
Bug: 271903097
Change-Id: I1959a82862790ff918571145b3651d164aa118b6
2023-03-31 20:11:44 +00:00
Aurélien Pomini
649c5082c6
Add contrast setting in dev options
...
See the attached video from b/266071578#comment2 to see how the setting
looks like.
Bug: 266071578
Test: atest ContrastDialogTest
Test: atest ContrastDialogControllerTest
Change-Id: Id9fc31a0562059814d4e342ea8095adc5b53d5f3
2023-03-31 19:35:08 +00:00