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
2f0cec804f
[automerger skipped] Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev am: 8a0074e909
am: f5ffb13dc1
-s ours
...
am skip reason: Merged-In I057b00fbca6660012887ebedf4d65c2c3d35792b with SHA-1 6bed01f315
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20414916
Change-Id: I40db91dc44b25ef1d6772c70faa50c13bf3d2f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-15 16:25:06 +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
sandeepjs
e69ab6cb77
[Android U][eSIM] Modify esim and sim card strings as part of esim primary
...
As part of esim primary, esim and sim card related strings are changed for AndroidSettings project with reference from https://docs.google.com/spreadsheets/d/1RPVnNvmcjd-NSvPGg1jOi0mdC-sbCHvt9HVU4glV8fs/edit#gid=1716745126
Test: build
Bug: 257380320
Change-Id: I984d56e724dbd906e48358a31c6a7cb1e5db4fdf
Merged-In: I984d56e724dbd906e48358a31c6a7cb1e5db4fdf
2022-11-15 11:11:50 +00:00
Wilson Wu
62c6b9f6aa
Merge "Fix show/hide virtual keyboard delay"
2022-11-15 08:48:48 +00:00
Sayak Dutta
e4445a6e86
Modify call to Header function of Glif Layout to disable autosize
...
Bug: 245483008
Change-Id: I117e11f40764bf599bfa655755107342252ca891
2022-11-15 08:24:30 +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
abb864bbaa
Merge "Move security_settings_sfps_enroll_finish to res-product"
2022-11-15 06:33:27 +00:00
Sandeep Jawalkar
5ac149af90
Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary"
2022-11-15 06:24:41 +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
sandeepjs
ecdfe28bd2
[Android U][eSIM] Modify esim and sim card strings as part of esim primary
...
As part of esim primary, esim and sim card related strings are changed for AndroidSettings project with reference from https://docs.google.com/spreadsheets/d/1RPVnNvmcjd-NSvPGg1jOi0mdC-sbCHvt9HVU4glV8fs/edit#gid=1716745126
Test: build
Bug: 257380320
Change-Id: I984d56e724dbd906e48358a31c6a7cb1e5db4fdf
2022-11-15 05:33:07 +00:00
Chaohui Wang
a5dfab3fc0
Move security_settings_sfps_enroll_finish to res-product
...
Bug: 253772249
Test: Make Settings
Change-Id: Id57c327573814cc99e11fede56f9a60a215fb494
2022-11-15 13:11:45 +08:00
Edgar Wang
1111e51f2c
Merge "Change preference value changed metrics log format"
2022-11-15 03:05:13 +00:00
Joshua Mccloskey
46b21bbab4
Merge "Centered fingerprint icon" into tm-qpr-dev am: 0fb3dc390c
am: 945d614158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20447129
Change-Id: Ie1e2f9e7e6ee04d24114eff301a86dd06ba96451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-15 02:41:05 +00:00
Joshua Mccloskey
946185e6e5
[automerger skipped] Merge "Remove sidefps toggle from SUW." into tm-qpr-dev am: 94ddcba809
am: 8bc66cbb9f
-s ours
...
am skip reason: Merged-In I0ea63a61908b45399ba09ff31fd8fe6a4aacfb41 with SHA-1 cfaf707a78
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20442178
Change-Id: I076b8e41b015bf1c4b551d6023bc57a220ea9471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-15 02:39:37 +00:00
Joshua Mccloskey
945d614158
Merge "Centered fingerprint icon" into tm-qpr-dev am: 0fb3dc390c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20447129
Change-Id: I9c88dcafd1cb73dae5dc1a7137ff78337d4d69bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-15 01:51:14 +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
0fb3dc390c
Merge "Centered fingerprint icon" into tm-qpr-dev
2022-11-15 01:14:07 +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
Grace Cheng
e4b09e55ca
Merge "Update fingerprint enrollment finished string" into tm-qpr-dev
2022-11-14 18:35:16 +00:00
Yining Liu
a3bfaed468
Merge "Increase the number of notification items that can be shown in Notification history - Recently dismissed" into tm-qpr-dev am: 3852625699
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20331041
Change-Id: I038807ba1cd80bee01db6f66ef13f16ca97ec604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-14 18:20:03 +00:00
Yining Liu
3852625699
Merge "Increase the number of notification items that can be shown in Notification history - Recently dismissed" into tm-qpr-dev
2022-11-14 17:58:28 +00:00
Joshua McCloskey
c10d8ca045
Remove sidefps toggle from SUW.
...
Test: Verified manully that the toggle is no longer
present when enrolling sidefps.
Fixes: 258687688
Change-Id: I0ea63a61908b45399ba09ff31fd8fe6a4aacfb41
Merged-In: I0ea63a61908b45399ba09ff31fd8fe6a4aacfb41
2022-11-14 17:29:58 +00:00
Joshua Mccloskey
7190e3a56c
Merge "Remove sidefps toggle from SUW."
2022-11-14 17:29:44 +00:00
João Victor Mendes Freire
0ed6e65e44
Merge "Fix settings crash when interact uninstalled app"
2022-11-14 16:31:35 +00:00
Joshua McCloskey
cfaf707a78
Remove sidefps toggle from SUW.
...
Test: Verified manully that the toggle is no longer
present when enrolling sidefps.
Bug: 258687688
Change-Id: I0ea63a61908b45399ba09ff31fd8fe6a4aacfb41
2022-11-14 16:22:12 +00:00
TreeHugger Robot
2c45688a13
Merge "Introduce concept of DockUser"
2022-11-14 15:00:56 +00:00
Arc Wang
32785eb260
Fix can't access SD card from work profile
...
It may not be reasonable to access SD card from
work profile launched File apps. This change
hides 'Files' Preference for SD card in Storage
Settings.
Bug: 238386355
Test: manual visual
Settings -> Storage -> SD card -> Work profile
Change-Id: Ibdbba930335cb4690a93fa6218b2991e13a3eca6
2022-11-14 22:21:16 +08:00
Bonian Chen
f2838421df
[Settings] configuration for hidding SIM lock UI
...
Hide SIM lock UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Merged-In: I870c0b53112db56b7bc80bfd585f6f7b3cf82737
Change-Id: I70be07dbc1decb5cb8eff384d4cb8bea355ab99d
2022-11-14 12:00:06 +00:00
Binyi Wu
7078a7662c
Update survey triggering mechanisms
...
Settings will send the Settings screen to a central decision-making
place instead of each page handling its own.
Bug: 236662190
Test: robotest, manual
Change-Id: Ibfbdd421c723158d8d317aa4a02d9b51f877316a
Merged-In: Ibfbdd421c723158d8d317aa4a02d9b51f877316a
2022-11-14 19:56:03 +08:00
Bonian Chen
3be07f0e15
[Settings] configuration for hidding SIM settings UI
...
Hide SIM settings UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: I3d6ecec1465189429f2a3ea026d15e23357d0832
2022-11-14 10:24:43 +00:00
Bonian Chen
e1a0637c3a
[Settings] configuration for hidding SIM remove UI
...
Hide SIM remove UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Merged-In: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
Change-Id: I8f0c1d53c4fe6e30280f2b7ae8f694cd27056e36
2022-11-14 10:19:27 +00:00
Bonian Chen
0e03586dda
[Settings] configuration for hidding SIM provider UI
...
Hide SIM provider UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Merged-In: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
Change-Id: Ibe22c3ba377a15f770622d235ebddc63b4bf3ed6
2022-11-14 10:06:48 +00:00