Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,700 Commits 1 Branch 0 Tags
db1ec87cb63da8be06b707533f998178cedac78f
Commit Graph

44306 Commits

Author SHA1 Message Date
Joshua Mccloskey
db1ec87cb6 Merge "Ensure text doesnt jump during enrollment" into tm-qpr-dev am: 1d04eb6eb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20488559

Change-Id: I85f20ce7a8c0d4973cdcb42744bb7d04b9a7b548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 17:25:44 +00:00
Joshua Mccloskey
1d04eb6eb7 Merge "Ensure text doesnt jump during enrollment" into tm-qpr-dev 2022-11-17 16:56:48 +00:00
Sam Dubey
48eae58586 Revert "Add configuration for defaulting notification behavior" am: a2d06273c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505171

Change-Id: Ic9b89ba7d709e09be8217252485adcfc49575d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 14:01:32 +00:00
Sam Dubey
a2d06273c1 Revert "Add configuration for defaulting notification behavior" 
Likely causing b/259499400

This reverts commit a92688d642.

Change-Id: I781a7ecf9139eca11e1db895f86268b893258543
 2022-11-17 07:33:18 +00:00
Sayak Dutta
3765a09a58 Merge "Modify call to Header function of Glif Layout to disable autosize" into tm-qpr-dev am: 03ed8c0477 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20472167

Change-Id: I580b3e0944fe2d232a11e73a7e349c6564debd48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-17 06:19:40 +00:00
Sayak Dutta
03ed8c0477 Merge "Modify call to Header function of Glif Layout to disable autosize" into tm-qpr-dev 2022-11-17 06:07:12 +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
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
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
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
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
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
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
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
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
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
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