Commit Graph

110794 Commits

Author SHA1 Message Date
changbetty
094c3df0b0 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: e644704bee -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419565

Change-Id: Iae493b9336afdd1d87cdd4772fad8102f0f6c405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 03:39:32 +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
Betty Chang
c8f6bba271 Merge "Make bluetooth switch not discoverable via SliceDeepLinkTrampoline" into tm-qpr-dev 2022-11-16 02:28:08 +00:00
Joshua McCloskey
88e2f1e0e0 Ensure text doesnt jump during enrollment
Test: Verified via fingerprint enrollment that dynamic text no longer
shifts the fingerprint icon view.
Fixes: 251235423

Change-Id: Ia70bb251af9df581e5c1e2b7dfcd9290dcc66b26
2022-11-16 01:45:15 +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
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
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
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
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
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
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
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
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
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
Hao Dong
3ca9965a96 Fix the flicker of FingerprintSettings before FingerprintEnrollIntro.
Change to launch FingerprintEnrollIntroductionInternal directly when no fingerprint enrolled and fingerprint is the only biometrics. This avoids the flicker of FingerPrintSettings before showing the enroll introduction.
This partially reverts the change in ag/19732076.

Bug: 256334588

Test: manual test following cases on fp-only devices, and enable don't
      keep activity and test them again.
      1. fp enrollment on SUW
      2. fp add another on SUW
      3. add first fp on Security Settings
      4. add another fp on Security Settings
Test: atest FingerprintStatusUtilsTest BiometricsSafetySourceTest

Change-Id: I057b00fbca6660012887ebedf4d65c2c3d35792b
Merged-In: I057b00fbca6660012887ebedf4d65c2c3d35792b
(cherry picked from commit 6bed01f315)
2022-11-12 23:41:37 +00:00
Grace Cheng
dd7e488197 Update fingerprint enrollment finished string
Updates string displayed at completion of fingerprint enrollment

Test: Observe updated string after enrolling a fingerprint
Fixes: 257898484
Change-Id: I40ab1b67030f164c96c8abca0837bacc1560d1b5
2022-11-12 00:08:10 +00:00
Steve Elliott
a92688d642 Add configuration for defaulting notification behavior
Test: RedactionInterstitialTest
Test: go through SUW on a phone
Bug: 240472040
Change-Id: I7bcd9f1a128c757881693e0251d305d2e26e4fd8
2022-11-11 14:08:09 -05:00
Treehugger Robot
cf573d51c6 Merge "Fix potential crash in AppAllServicesPreferenceController" am: ccfa7fa918 am: 0ecb9e76fe
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2296917

Change-Id: I8047a4e55b534076ac9fb65e99934fe7d3a3e695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-11 12:17:57 +00:00
Treehugger Robot
0ecb9e76fe Merge "Fix potential crash in AppAllServicesPreferenceController" am: ccfa7fa918
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2296917

Change-Id: I7477f18dc0e0a0aea9adf8e996171210dc194ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-11 11:48:15 +00:00
Treehugger Robot
ccfa7fa918 Merge "Fix potential crash in AppAllServicesPreferenceController" 2022-11-11 11:10:12 +00:00
Bonian Chen
647e3fe4e5 Merge "[Settings] Improve PremiumSMS's auto test" into tm-qpr-dev am: 30ce9a78ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20429443

Change-Id: I712b90a9a09ebb2bfe064f4e6a37930d2b977bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-11 10:24:00 +00:00
Bonian Chen
56e5d50ca7 Merge "[Settings] enhancing data saver config control" into tm-qpr-dev am: 106fd86520
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419511

Change-Id: I5338c24812346b79068b1fee0c5ba98ff07eec33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-11 10:23:48 +00:00
Bonian Chen
86e2948eb6 Merge "[Settings] Hide data usage when SIM support is turn OFF" into tm-qpr-dev am: a6824c9b34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419510

Change-Id: Ie433daffbe56a1a526880c2e254a13ff17aaa3c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-11 10:23:44 +00:00
Bonian Chen
30ce9a78ee Merge "[Settings] Improve PremiumSMS's auto test" into tm-qpr-dev 2022-11-11 09:35:42 +00:00
Bonian Chen
106fd86520 Merge "[Settings] enhancing data saver config control" into tm-qpr-dev 2022-11-11 09:35:21 +00:00
Bonian Chen
a6824c9b34 Merge "[Settings] Hide data usage when SIM support is turn OFF" into tm-qpr-dev 2022-11-11 09:35:21 +00:00
TreeHugger Robot
19bc5093dd Merge "Shorten the search box hint for two-pane layout" into tm-qpr-dev am: 0b0e75d726
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20441365

Change-Id: Ib4ea24d56abf44dc50d94852efc4a6d2cc3e1de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-11 03:42:13 +00:00
TreeHugger Robot
7578a43c94 Merge "Fix app battery usage list launch incorrect works app" into tm-qpr-dev am: b0503be6fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20336174

Change-Id: I9a92a7de4f517330604673ce97bb1a626f824626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-11 03:41:29 +00:00
TreeHugger Robot
0b0e75d726 Merge "Shorten the search box hint for two-pane layout" into tm-qpr-dev 2022-11-11 03:30:50 +00:00
TreeHugger Robot
b0503be6fd Merge "Fix app battery usage list launch incorrect works app" into tm-qpr-dev 2022-11-11 03:10:06 +00:00
Joshua McCloskey
566a7a3031 Centered fingerprint icon
Test: Verified icon was centered in the fingerprint enrollment finish
page.
Fixes: 258604191

Change-Id: I33f19731921ef39829a6bbbaa1d1b097b95d64d4
2022-11-11 00:03:34 +00:00