Commit Graph

45762 Commits

Author SHA1 Message Date
Chaohui Wang
271d59bec4 Update for MoreOptionsAction
Bug: 259492166
Test: Manually with Settings
Change-Id: I0b0b570a456d9464043a221a628ed33c19d780df
2022-11-17 13:05:12 +08:00
Xuanang Zhao
8ad4ac66c8 Add type annoation.
Change-Id: Idb0b5db3a2116b71ab1aaa7e55d332144ff2b8fb
2022-11-17 11:32:42 +08:00
Diya Bera
f0da87dae8 Merge "Remove header "When using fingerprint unlock" for Udfps" into tm-qpr-dev am: b4a0a0563d am: 4688fd9074
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20499435

Change-Id: I6251ada6b0da4222bb676ac4e4b04db3e7b73717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 01:41:02 +00:00
Diya Bera
4e8b9135c3 Merge "Device displays fingerprint enrollment after swiping back" into tm-qpr-dev am: dfe2bd2df2 am: 6c1eae8a1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20497232

Change-Id: I2814b4cd69881415a5a4105058f00973b29a3000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 01:38:36 +00:00
Diya Bera
4688fd9074 Merge "Remove header "When using fingerprint unlock" for Udfps" into tm-qpr-dev am: b4a0a0563d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20499435

Change-Id: I65f8405eda3e12b83a365bd469a3a0ce3f5c9f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 01:13:18 +00:00
Diya Bera
6c1eae8a1e Merge "Device displays fingerprint enrollment after swiping back" into tm-qpr-dev am: dfe2bd2df2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20497232

Change-Id: I3a0bcd951ba560a25e257f3dbe4c9657a1e82134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 01:12:56 +00:00
Diya Bera
b4a0a0563d Merge "Remove header "When using fingerprint unlock" for Udfps" into tm-qpr-dev 2022-11-17 00:59:35 +00:00
Diya Bera
68903de369 Remove header "When using fingerprint unlock" for Udfps
Fixes: 257272989
Test: Manual - Open Fingerprint Settings and observe the UI
Change-Id: I98235e56a3537eff00490584c88f459ac755433f
2022-11-16 21:08:04 +00:00
Treehugger Robot
dd5e46746c Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a am: 425521478a am: 1b70bcbdc4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183

Change-Id: I23c0fa56c122e7406229fc80bbe49fcba7160861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 19:59:31 +00:00
Betty Chang
ba3405bd37 Merge "Make bluetooth switch not discoverable via SliceDeepLinkTrampoline" into tm-qpr-dev am: c8f6bba271 am: f200134fc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20410007

Change-Id: If5d07a5a3ae099d1cb765a2fbb3069ab0ac00285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 19:57:13 +00:00
Diya Bera
fa0c412104 Merge "Fixes loop in Fingerprint Enrollment" into tm-qpr-dev am: fe3305016a am: 507fae7cbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20468119

Change-Id: Id8bba8a34b1101e828726d6c697d057db69e7fd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 19:52:49 +00:00
Diya Bera
c4b95de536 Device displays fingerprint enrollment after swiping back
Fixes: 259198369
Test: Manual - repro steps in bug
Change-Id: Ide7fa0d16daba795cfc3c63a5da351000f918a81
2022-11-16 18:34:26 +00:00
Treehugger Robot
1b70bcbdc4 Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a am: 425521478a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183

Change-Id: I84c783493a82247653fdc60932a0383d0c74d61f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 09:40:56 +00:00
Treehugger Robot
425521478a Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183

Change-Id: Idb18ef0319f4a36e49cc01f9d9fced1918d12096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 09:08:59 +00:00
Binyi Wu
5b4cae3900 Merge "Update survey triggering mechanisms" into tm-qpr-dev am: d5d2dc4e22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454690

Change-Id: I1b60ec07a8eb8efae0859051c923adb13bf07e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 07:55:53 +00:00
Binyi Wu
d5d2dc4e22 Merge "Update survey triggering mechanisms" into tm-qpr-dev 2022-11-16 07:13:53 +00:00
Arc Wang
6bd49c4f6d Merge "Fix can't access SD card from work profile" 2022-11-16 06:15:05 +00:00
Yu
0aed038b0a Make p2p start searching after turning off airplane mode.
In the P2P page, p2p stops searching when airplane mode is turned on, and should start searching when airplane mode is turned off.

Bug: 255249207
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest

Signed-off-by: Yu <zhangyu34@xiaomi.com>
Change-Id: I71d5eb6c3d8533417e8ae9ac09e7fac73983644e
2022-11-16 12:19:23 +08:00
TreeHugger Robot
a4b2bc9b2b Merge "Fix NPE of mDismissListener in Rename Dialog" 2022-11-16 03:26:40 +00:00
Betty Chang
f200134fc4 Merge "Make bluetooth switch not discoverable via SliceDeepLinkTrampoline" into tm-qpr-dev am: c8f6bba271
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20410007

Change-Id: I5195b9513c575bc28f0b6930a6c40c570048f6d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 03:10:44 +00:00
TreeHugger Robot
daf43a4605 Merge "Apply feature flag for biometrics" 2022-11-16 02:40:28 +00:00
Betty Chang
c8f6bba271 Merge "Make bluetooth switch not discoverable via SliceDeepLinkTrampoline" into tm-qpr-dev 2022-11-16 02:28:08 +00:00
Diya Bera
507fae7cbc Merge "Fixes loop in Fingerprint Enrollment" into tm-qpr-dev am: fe3305016a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20468119

Change-Id: I14371b5a594057c975079438075e7087df16f809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 01:24:40 +00:00
Adam Bookatz
632754a466 Merge "Introduce concept of DockUser" into tm-qpr-dev am: 9703f6a154
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20406629

Change-Id: I1048ec3d84b6acce75102f449d1fdbd4fde54abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 01:23:04 +00:00
Diya Bera
fe3305016a Merge "Fixes loop in Fingerprint Enrollment" into tm-qpr-dev 2022-11-16 01:01:14 +00:00
Adam Bookatz
9703f6a154 Merge "Introduce concept of DockUser" into tm-qpr-dev 2022-11-16 00:59:41 +00:00
TreeHugger Robot
148774d287 Merge "Fingerprint Introduction FragmentActivity" 2022-11-16 00:04:49 +00:00
TreeHugger Robot
7765c7129b Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev am: e2e892d46c am: 54170343cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454246

Change-Id: Ic5021313463c2fb955d2e5066a5b8f9dec4603fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 23:40:08 +00:00
TreeHugger Robot
54170343cf Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev am: e2e892d46c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454246

Change-Id: I3f6ad58e5f8292642d7eb958402d172537536d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 23:00:52 +00:00
TreeHugger Robot
e2e892d46c Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev 2022-11-15 22:42:34 +00:00
lbill
c9f58d684e Fix NPE of mDismissListener in Rename Dialog
Bug: 241122882
Test: Enroll 1 fingerprint, and rename in landscape mode, check no
more NPE when focus on inputfield and IME shown

Change-Id: I24fe9aab11cabd67015989cfaaf6a8228ea72b59
2022-11-15 19:06:00 +00:00
Diya Bera
541185d383 Fixes loop in Fingerprint Enrollment
Remove "Try again" in error dialog, since credential has timed out and
user needs to use pin/password/pattern before being able to enroll
fingerprint

Bug: 258307019
Test: Try to enroll fingerprint after 10 minutes of entering credential,
timeout dialog is shown with only one button to avoid looping

Change-Id: Ibb9a9e2095a1277fa01adc8eb5ce04af1b9ce495
2022-11-15 18:22:36 +00:00
Hao Dong
f5ffb13dc1 Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev am: 8a0074e909
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20414916

Change-Id: Ibbc4c72d598d16b0bc99c36fb311d90bc1765912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 16:04:49 +00:00
Hao Dong
8a0074e909 Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev 2022-11-15 15:40:37 +00:00
YK Hung
94bd431d34 Merge "Clean up the KEY_ROUTINE from the Settings" 2022-11-15 15:25:04 +00:00
Ankita Vyas
3503cc3cbf Merge "Do not show Choose Profile dialog for clone user." 2022-11-15 11:13:26 +00:00
Wilson Wu
62c6b9f6aa Merge "Fix show/hide virtual keyboard delay" 2022-11-15 08:48:48 +00:00
ykhung
3cf14b682e Clean up the KEY_ROUTINE from the Settings
Fix: 258603978
Test: make RunSettingsRoboTests
Change-Id: I65033ca18953b57317af64418bb0b18d48eaacd8
2022-11-15 16:07:57 +08:00
“Ankita
9304977674 Do not show Choose Profile dialog for clone user.
Bug: 249194639
Test: make RunSettingsRoboTests -j64
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ProfileSelectDialogTest
Change-Id: I35279f643f8c562df7b407fdf2cbfd2ae5ee9890
2022-11-15 07:49:09 +00:00
Treehugger Robot
0fb49d7299 Merge "Update owner for Settings project" am: 20a3f8f9e8 am: 73c0f408a4 am: 486c74f4fa
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2291755

Change-Id: If6ef7e90e3834082c94da696ce81e1ed655b12e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 07:14:53 +00:00
Treehugger Robot
486c74f4fa Merge "Update owner for Settings project" am: 20a3f8f9e8 am: 73c0f408a4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2291755

Change-Id: Id1fe88f9af281f087c1291fa9645fab51ef9295d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 06:53:55 +00:00
Treehugger Robot
73c0f408a4 Merge "Update owner for Settings project" am: 20a3f8f9e8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2291755

Change-Id: I083eb43c64d81ebc75e33e0abf0fe8d063be1425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 06:22:14 +00:00
Treehugger Robot
20a3f8f9e8 Merge "Update owner for Settings project" 2022-11-15 05:43:00 +00:00
Edgar Wang
1111e51f2c Merge "Change preference value changed metrics log format" 2022-11-15 03:05:13 +00:00
Joshua Mccloskey
8bc66cbb9f Merge "Remove sidefps toggle from SUW." into tm-qpr-dev am: 94ddcba809
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20442178

Change-Id: Ib5ddf26067cdd3e07ebc414aa82306fee68e0add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 01:50:46 +00:00
Joshua Mccloskey
94ddcba809 Merge "Remove sidefps toggle from SUW." into tm-qpr-dev 2022-11-15 01:14:01 +00:00
Grace Cheng
57c6df710b [conflict] Merge "Update fingerprint enrollment finished string" into tm-qpr-dev am: e4b09e55ca am: aa3465b842
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20452306

Change-Id: I355e42fb9ea5bafe62006e152c52cd04cd62e109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 21:26:38 +00:00
Adam Bookatz
e5e232428d Introduce concept of DockUser
Dreams and docking often refers to "user zero" or "system user".
But more generally, the special user for dreams or switching-to-on-docking
need not be user 0, and in fact won't be in certain modes. So this needs updating.

Test: the files mentioned in the topic
Bug: 257333623
Change-Id: If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd
Merged-In: If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd
2022-11-14 19:19:21 +00:00
Grace Cheng
aa3465b842 Merge "Update fingerprint enrollment finished string" into tm-qpr-dev am: e4b09e55ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20452306

Change-Id: I8b9b3ec232d2950b859f66c0ce547ea9ae9e3dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 19:06:02 +00:00
Yining Liu
0a2c5d069a Merge "Increase the number of notification items that can be shown in Notification history - Recently dismissed" into tm-qpr-dev am: 3852625699 am: a3bfaed468
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20331041

Change-Id: I657ccff8aee603e79cf3f85e43e2175fefded593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 18:53:52 +00:00