Hao Dong
af36dfb674
Merge "Fix pattern rotation header text." into udc-qpr-dev am: a7af958f4c am: f24edbfc3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23699586
Change-Id: I6e1cd3c3b1965db0da12bd4115fd2e1c20858435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 19:41:57 +00:00
Hao Dong
f24edbfc3b
Merge "Fix pattern rotation header text." into udc-qpr-dev am: a7af958f4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23699586
Change-Id: Ic0639b7b3d5304a2900d6f2b2c1749129c669796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 18:59:21 +00:00
Hao Dong
a7af958f4c
Merge "Fix pattern rotation header text." into udc-qpr-dev
2023-06-23 17:57:12 +00:00
Hao Dong
59a4bf3565
Merge "Fix require on screen toggle on guest user." into udc-qpr-dev am: 800728a5a6 am: 7461036d68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23714620
Change-Id: I62554d897396b165f02bac58b0d1d9673a409033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 04:56:28 +00:00
Hao Dong
7461036d68
Merge "Fix require on screen toggle on guest user." into udc-qpr-dev am: 800728a5a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23714620
Change-Id: I77aa61c6d6f3f52e275754f17e56586e335da2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 03:30:11 +00:00
Hao Dong
70c833b8a2
Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 am: d44eccbc5f am: 3f4a489b02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213
Change-Id: Icf8b4f61424f79b4599c530d1aefe88d6cd6a795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 02:45:31 +00:00
Hao Dong
35ebdefcd8
Fix pattern rotation header text.
...
Bug: 278055194
Test: atest ChooseLockPatternTest
Change-Id: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
2023-06-23 02:37:22 +00:00
Hao Dong
800728a5a6
Merge "Fix require on screen toggle on guest user." into udc-qpr-dev
2023-06-23 02:36:48 +00:00
Hao Dong
3f4a489b02
Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 am: d44eccbc5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213
Change-Id: Id3aaa0b9e529de1dfde98decec6095f79e4b71f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 01:36:00 +00:00
Hao Dong
02f72c16ae
Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213
Change-Id: I97978a19733bc19904bd7fb72d80955e1f400d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 00:52:35 +00:00
Hao Dong
d44eccbc5f
Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213
Change-Id: Idc66a1838b701b91affa038a581b1410b78115a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 00:50:35 +00:00
Hao Dong
c9a99978f9
Fix require on screen toggle on guest user.
...
Bug: 286018876
Test: atest FingerprintSettingsFragmentTest
Change-Id: I432ffd3b8b32caeaf7ac8c6bc3c2ee2a0ee53a08
2023-06-23 00:32:32 +00:00
Evan Chen
7f12ecfc00
Merge "Make sure work profile app cant enable notification listener services"
2023-06-21 20:24:09 +00:00
Hao Dong
bf84218753
Fix delete face button disappear after reenroll
...
Test: manual test - 1.enroll a face 2. delete the face and reenroll 3.
back to face settings page, the button is delete button instead of set
up button
Bug: 285806446
Change-Id: I6739296b0b099446489956f8f609c87600ffdaa3
2023-06-21 18:45:40 +00:00
TreeHugger Robot
cc6e6ef83b
Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9 am: 87f7101866 am: 6df1a755e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764
Change-Id: I97764666fcf0f9547333133ae906939c6fb00df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 08:05:18 +00:00
Candice Lo
958e154598
Merge changes I75d810e4,I50111f0c into udc-qpr-dev am: 290d241b1b am: 380deaaa3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23738691
Change-Id: Ia01815e7558b7f31eb05c7bd1fa12c7a7a930cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 08:04:56 +00:00
Treehugger Robot
74e2f4e890
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06 am: 975e782dd4 am: a58d63cfc7 am: 01c4dd3eb8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: Ib43b827e3aaa9b8786b053bc4b0838c0d9cb0395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 08:04:15 +00:00
TreeHugger Robot
dfe6fac149
Merge "[BiometricsV2] Refactor EnrollingSfpsFragment"
2023-06-21 08:03:37 +00:00
TreeHugger Robot
3b03be9fe3
Merge "Update BatterySettingsFeatureProvider interface" into udc-qpr-dev am: fcd80ade3b am: 3924138fb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729063
Change-Id: I4e50da4138c440758314c169699439cf8f9bad1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 07:40:16 +00:00
Chaohui Wang
6ceab64548
Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15 am: 6bceb29408 am: c1f06b5e28 am: 8429e8cc79
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910
Change-Id: I78d51e756ebdb33200d349d92b52e38c87ddd0d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 07:39:45 +00:00
Chaohui Wang
2793cb49a2
[LE Broadcast] Fix crash when scan QR code am: c91d017080 am: fd264a7696 am: d7147fd952
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729065
Change-Id: Ia9075bfbbb43433db895af2de6b8eff0c56a6a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 07:39:22 +00:00
Chaohui Wang
fd4bfd4c0e
[lint] Fix Wrong Resource Type am: 7aaceaa782 am: 68159be3ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23734154
Change-Id: I3ce015dfd694e6c7cbdb247a2026e845ea3eb717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 07:39:11 +00:00
TreeHugger Robot
6df1a755e6
Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9 am: 87f7101866
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764
Change-Id: I8e54e0df96cc0967dd470661650cf4e3c7d9b8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 05:40:59 +00:00
TreeHugger Robot
d6ae6f8655
Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764
Change-Id: I8eb18e0f788a9a26da01222abd17149c350fc4ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 05:02:26 +00:00
TreeHugger Robot
87f7101866
Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764
Change-Id: I8ca64005b6dcdc623771de162eb6d68f7fb65808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 04:58:20 +00:00
Treehugger Robot
ef957eda5a
Merge "[BiometricsV2] Refactor EnrollingRfpsFragment"
2023-06-21 04:55:47 +00:00
Treehugger Robot
2c75f0e207
Merge "[BiometricsV2] Refactor FindSfpsFragment"
2023-06-21 04:55:43 +00:00
Treehugger Robot
a9aca48fcf
Merge "[BiometricsV2] Refactor FindRfpsFragment"
2023-06-21 04:55:36 +00:00
TreeHugger Robot
c548cdc4a9
Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev
2023-06-21 04:25:57 +00:00
Rambo Wang
330a6b2259
Merge "Fix Settings app ANR due to blocking IDumpstateDevice IPC call" into udc-qpr-dev am: de5c8613ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23745833
Change-Id: I81bd6c6a628ff71b2dbc32bd3076ec03981e6b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 02:28:06 +00:00
Milton Wu
75450f7973
[BiometricsV2] Refactor FindSfpsFragment
...
Refactor FingerprintEnrollFindSfpsFragment to kotlin and add bindView()
method for it
Bug: 286197831
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Side fingerpint device
Change-Id: If1c7d95e78c5be237f05209afa3ffc0b4c444c61
2023-06-21 09:56:32 +08:00
Milton Wu
00bafe9f64
[BiometricsV2] Refactor EnrollingRfpsFragment
...
Refactor FingerprintEnrollEnrollingRfpsFragment to kotlin and add
bindView() method for it.
Bug: 286198028
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Rear fingerpint device
Change-Id: Ie271386f305003a89d7e545c289e47bbafb14a90
2023-06-21 09:54:55 +08:00
Milton Wu
ada229b409
[BiometricsV2] Refactor FindRfpsFragment
...
Refactor FingerprintEnrollFindRfpsFragment to kotlin and add bindView()
method for it
Bug: 286197313
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Rear fingerpint device
Change-Id: Ifa11888f3e848fb7127e14ddcc41d02277163a1a
2023-06-21 09:52:35 +08:00
Milton Wu
1f2ef79fad
[BiometricsV2] Refactor EnrollingSfpsFragment
...
Refactor FingerprintEnrollEnrollingSfpsFragment to kotlin and add
bindView() method for it
Bug: 286197400
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Side fingerpint device
Change-Id: I57fe2b07f635e9558372d003b61c419d9447f12b
2023-06-21 09:49:57 +08:00
Rambo Wang
de5c8613ba
Merge "Fix Settings app ANR due to blocking IDumpstateDevice IPC call" into udc-qpr-dev
2023-06-21 01:48:56 +00:00
Candice Lo
380deaaa3b
Merge changes I75d810e4,I50111f0c into udc-qpr-dev am: 290d241b1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23738691
Change-Id: I7c32cba3253b5f5811269ebe5a37099bbb8eb66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 01:20:02 +00:00
Candice Lo
290d241b1b
Merge changes I75d810e4,I50111f0c into udc-qpr-dev
...
* changes:
Doing null check before generating Extra Dim tooltip
Doing null check before generating Font Size tooltip
2023-06-21 00:51:48 +00:00
Weng Su
7bd6646e5f
Remove Wi-Fi hotspot from settings search for non-admin users
...
- Don't use ViewModel if the settings UI is restricted
Bug: 284931681
Test: manual test
atest -c WifiTetherSettingsTest
Change-Id: I3ae23b01b3be821c3560552b39cbd83ab51b2095
2023-06-21 06:58:18 +08:00
Julia Tuttle
20ac28dfa2
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8 am: 205135ffa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I5550ca3651118e96d986cc714102596966a380b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 18:36:04 +00:00
Julia Tuttle
87d6681e8b
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I351f38d15518deac4a5fd109b79b9ba6368d001e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:50:52 +00:00
Julia Tuttle
205135ffa4
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I4fb9af8f7ea4bf07b81b9a12034700cee6ca5905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:48:41 +00:00
Julia Tuttle
1ddbbd4542
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 2390428dd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I62ce7d8d02d54605e3115ed3abd7583ad05010be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:48:39 +00:00
Julia Tuttle
4d3b967fb8
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: Id026252a0ef651a3ef12d1e1fdbf261368f0d18e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:06:35 +00:00
Treehugger Robot
01c4dd3eb8
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06 am: 975e782dd4 am: a58d63cfc7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: Ibb680bb112743989cc8f1468b08ea1e547974cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 15:58:58 +00:00
Treehugger Robot
a58d63cfc7
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06 am: 975e782dd4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I9294386b4cec4e05c6d843420313dc52a74efa9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 15:20:54 +00:00
Treehugger Robot
975e782dd4
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I4b486b4da6d99522ab004876fb1abdc2f45766dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 14:37:21 +00:00
Treehugger Robot
e1858cab06
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I41a6347afc1fe6a038ac75bf6a76855b42268f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 13:50:31 +00:00
Treehugger Robot
45918b72bf
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I11e6110ba0b640be8b373d9afd45f806c005b05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 13:13:42 +00:00
Treehugger Robot
aa3dc53d97
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE"
2023-06-20 12:13:34 +00:00
TreeHugger Robot
3924138fb7
Merge "Update BatterySettingsFeatureProvider interface" into udc-qpr-dev am: fcd80ade3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729063
Change-Id: Ic6a9df6ddf6ca3c0cd5f8501f95cf4684a9d43a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 02:59:40 +00:00