Commit Graph

15680 Commits

Author SHA1 Message Date
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
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
TreeHugger Robot
8ae1abecc1 Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev 2023-03-31 18:48:29 +00:00
Candice Lo
d2c53a2085 Announce scaled value for font scaling seekbar in Talkback
1. Keeping state descriptions for the seekbar as an array in the
   PreviewSizeSeekBarController when we would like to customize the
   state description.
2. Setting the scaled value to be the state description for the font
   scaling seekbar when there is a progress change to the seekbar.

Bug: 269212483
Test: manually - attach videos to the bug
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PreviewSizeSeekBarControllerTest
Change-Id: I8e9e3681a0174f454cac871ebf62d785962c7165
2023-03-31 17:38:14 +00:00
Treehugger Robot
6684c9b6fc Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd am: 06bca85c6a am: 486691ad26 am: e1bcb16bfb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I83ed2f2a8790d7245e81f365fe6aeebbde604522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 11:00:57 +00:00
Wilson Wu
7dc217f8f6 Merge "Fix wrong user in personal profile" into udc-dev am: ce7ad1f8a0 am: 4d91298836
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22307474

Change-Id: I6d5913765e265161918fc77b28b0da07ff128981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 10:59:57 +00:00
Treehugger Robot
486691ad26 Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd am: 06bca85c6a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I94301fd7e273f781aa5029128d960f8b9fb1c2da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 10:03:11 +00:00
Wilson Wu
ce7ad1f8a0 Merge "Fix wrong user in personal profile" into udc-dev 2023-03-31 09:56:56 +00:00
Treehugger Robot
06bca85c6a Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I77867e2c59c5745cf8b705072e5b0b35c455f399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 09:34:23 +00:00
Hao Dong
f56b8bc2a4 Merge "Post-enroll settings screen shows class 3 strings" into udc-dev am: 9ff72e4205 am: 5b159df4f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22314938

Change-Id: I2d7a6be0e98921b7adbc99646b3ebd30764bdc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 06:01:03 +00:00
Hao Dong
9ff72e4205 Merge "Post-enroll settings screen shows class 3 strings" into udc-dev 2023-03-31 04:44:16 +00:00
Patty Huang
b79d64ee90 Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"
Bug: 275388899
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioAllowListPreferenceControllerTest
Change-Id: Ic936eb22aa4f6efd97d3a84b23a44fab83dd09a0
2023-03-31 12:43:14 +08:00
Hao Dong
b0ff672a7e Post-enroll settings screen shows class 3 strings
Test: atest FaceSettingsFooterPreferenceControllerTest
Test: manual test
Bug: 274959218
Change-Id: I2e30666baf36a48a47e9ed9e4e046cefc805995a
2023-03-31 03:05:57 +00:00
TreeHugger Robot
3d473b86a4 Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f am: 17e504f6a8 am: 15343f6585
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478

Change-Id: Ie8123290c29d6560ad10aa0da19573a2f28a5e71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 01:00:59 +00:00
TreeHugger Robot
17e504f6a8 Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478

Change-Id: Ibfe01c87ea15467a736ccaf7d812c8eaffaefa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:39:38 +00:00
TreeHugger Robot
3b74f7a188 Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3 am: 64aa2889d1 am: 5d0b8031fd am: 76932b5ee4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468

Change-Id: Ic5000b6d94276c6306d20b4335389f9697f68ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:10:56 +00:00
TreeHugger Robot
93e48fba81 Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb am: b3599ae3b6 am: d82f2eae5c am: 8838d8639d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902

Change-Id: Ifa3cb5a55134c0cf3cddd3390cd5b7884fb57e48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:10:44 +00:00
TreeHugger Robot
73e2d7966e Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev am: 3d548d2f2d am: b33294a11d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21618252

Change-Id: I07f8ae6e4db1dd9ff8d939af794d2c77fa8b7f84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:10:06 +00:00
TreeHugger Robot
bf52934fe2 Merge "Remove unused listener" into udc-dev am: a99c64dfde am: 9a0c0d7a82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339269

Change-Id: I3b627dc32e633776350f292c2bd1333bb96f894d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:07:16 +00:00
TreeHugger Robot
f02d69dd4f Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478

Change-Id: I6fcc26d5db647b9c36b743592a8b58dda52b1847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:04:20 +00:00
TreeHugger Robot
5bde972e4e Merge "Restrict DataUsageList for guest user" into tm-qpr-dev 2023-03-30 19:08:44 +00:00