Commit Graph

101411 Commits

Author SHA1 Message Date
Eric Biggers
94ebb2e9e5 Remove CryptKeeper am: 438c3af097
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945498

Change-Id: I88a8b9792ad9a0b87cd719baf066a9b337f32d79
2022-03-08 19:04:08 +00:00
Eric Biggers
12ba0209a2 Merge changes from topic "remove-fde"
* changes:
  Remove FDE support from accessibility settings
  Rename crypt_keeper_* strings that are still used
  Remove CryptKeeperSettings
  Remove CryptKeeper
2022-03-08 18:37:00 +00:00
Lucas Silva
14aa9069fa Merge "Add master toggle to enable/disable screen savers" into tm-dev am: b048c37062 am: 5d51ce5990
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17073795

Change-Id: I0e3803edd5cea7bd5185e5a067924676c02a5a4a
2022-03-08 18:13:49 +00:00
Yasin Kilicdere
a366493c2c Merge "Update UI to show feedback while creating Guest from Settings." into tm-dev am: 161697beef am: f9dd9ebfd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17084564

Change-Id: Ieef0e3547b1a312cc306378124deaea562f26eaa
2022-03-08 18:04:02 +00:00
Lucas Silva
0a250a7b08 Merge "Add master toggle to enable/disable screen savers" into tm-dev am: b048c37062
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17073795

Change-Id: Ib20008f61d7f1cad6e0dc9bf23d0101b5fb2054a
2022-03-08 18:03:54 +00:00
Lucas Silva
5d51ce5990 Merge "Add master toggle to enable/disable screen savers" into tm-dev am: b048c37062
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17073795

Change-Id: I7ff138626b93f227ca42546a2b3500d00b7d0f0b
2022-03-08 18:03:21 +00:00
Jernej Virag
69b895c892 Add animation to button navigation settings page
This animation was missing in the original changelist and has now been created by the UX team.

Bug: 191888710
Test: Physical device
Change-Id: Iefb3f0e80f4763f1358706e9dbc84a29e1f04b23
2022-03-08 17:59:56 +00:00
Ricky Wai
18602ea97a Show lock icon in restricted settings dialog
Bug: 221847335
Test: After applying restricted settings, the dialog shows the icon now.
Change-Id: If4b55d4320956625141973c337ae7ef2a3bd8dbc
2022-03-08 17:58:13 +00:00
Lucas Silva
0abc02c446 Fix WhenToDreamPickerTest and re-enable.
The test was previously failing because it was passing a mock context
which didn't support all the operations of a real context.

Bug: 216036457
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.WhenToDreamPickerTest"
Change-Id: I2c769658dc687ef26d184b7ce9065c18ab8b9b8d
2022-03-08 12:57:18 -05:00
Lucas Silva
b048c37062 Merge "Add master toggle to enable/disable screen savers" into tm-dev 2022-03-08 17:54:16 +00:00
Yasin Kilicdere
f9dd9ebfd5 Merge "Update UI to show feedback while creating Guest from Settings." into tm-dev am: 161697beef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17084564

Change-Id: I9a51db701117450c2085f5aa25707bcc14c62cfd
2022-03-08 17:49:36 +00:00
Yasin Kilicdere
76feaa60a7 Merge "Update UI to show feedback while creating Guest from Settings." into tm-dev am: 161697beef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17084564

Change-Id: I8b9bca2cd491d1775760b9c8de16adf915953ebe
2022-03-08 17:49:04 +00:00
Yasin Kilicdere
161697beef Merge "Update UI to show feedback while creating Guest from Settings." into tm-dev 2022-03-08 17:41:16 +00:00
Eric Biggers
64dc746a68 Rename crypt_keeper_* strings that are still used
Some strings used in the Settings UI have "crypt_keeper" in their names,
but they aren't specific to FDE, which is no longer supported.  They are
still used to report the encrypted status of the device on devices that
use FBE, or the unencrypted status of the device on devices that don't
have encryption enabled at all.  Rename these strings appropriately.

Test: On Cuttlefish with and without encryption enabled, tested visiting
      the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: Ic63910c870837f5b37e4407ba5b3c7629e925c17
(cherry picked from commit 6552bdd0ef)
Merged-In: Ic63910c870837f5b37e4407ba5b3c7629e925c17
2022-03-08 17:13:22 +00:00
Eric Biggers
922a11f659 Remove CryptKeeperSettings
FDE support has been removed in favor of FBE, so remove the FDE settings
from the "Encryption & credentials" page of the Settings app.

For now I didn't change the way the page appears on devices that don't
use FDE; as before, it still lists "Encrypt phone", followed by either
"Encrypted" or "Phone not encrypted" with no changeable settings.  Note
that the strings used for this have "crypt_keeper" in their names but
aren't specific to FDE; the next CL will rename them.

Test: On Cuttlefish with and without encryption enabled, tested visiting
      the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: I3ce9894291ea1f1886f21980a86a92bfce38038a
(cherry picked from commit 36609c18d1)
Merged-In: I3ce9894291ea1f1886f21980a86a92bfce38038a
2022-03-08 17:13:22 +00:00
Eric Biggers
438c3af097 Remove CryptKeeper
Since Android 10, new devices have been required to use FBE (File Based
Encryption) instead of FDE (Full Disk Encryption).  FDE support was
already removed from system components such as init and vold.
Therefore, the CryptKeeper activity is no longer needed.  Remove it.

Note: this CL only removes CryptKeeper itself, i.e. the activity which
runs at boot time on devices that are using FDE or are being encrypted
with FDE in-place.  Later CLs will remove FDE-specific code from the
Settings app.

Bug: 208476087
Change-Id: I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9
(cherry picked from commit 43616ed3b6)
Merged-In: I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9
2022-03-08 17:13:22 +00:00
Eric Biggers
c300a01bf4 Remove FDE support from accessibility settings
With FDE (Full Disk Encryption), secure start-up (i.e. requiring a PIN /
pattern / password to boot the device) was incompatible with
accessibility services.  Thus, the accessibility settings would ask the
user to disable secure start-up when enabling an accessibility service.

Now that FDE support has been removed in favor of FBE (File Based
Encryption), this is no longer necessary.  Remove it.

Bug: 208476087
Change-Id: I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f
(cherry picked from commit b4060ef65b)
Merged-In: I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f
2022-03-08 17:13:22 +00:00
Eric Biggers
a00c327707 Merge changes from topic "remove-fde" into sc-v2-dev-plus-aosp
* changes:
  Remove FDE support from accessibility settings
  Rename crypt_keeper_* strings that are still used
  Remove CryptKeeperSettings
  Remove CryptKeeper
2022-03-08 17:11:15 +00:00
Presubmit Automerger Backend
56da5fd632 [automerged blank] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb 2p: 407022ff92
Blank merge reason: Change-Id I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 4a75dc192c is in history

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

Bug: 201519976
Change-Id: I358fae127244d34d82b639b4a71993cfe14a8914
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
2022-03-08 16:10:52 +00:00
PETER LIANG
51f927066f Merge "Fix that the preview text in "Text and reading options" page is too small." into tm-dev am: 3ccdcd433a am: 36d0d31cb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106241

Change-Id: Iaf6e87fafb1f6654c823f80035d46417a41a9cdf
2022-03-08 16:10:41 +00:00
Presubmit Automerger Backend
407022ff92 [automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783

Bug: 201519976
Change-Id: Id4e717096e077e2940a0d99e01448f3b1213d532
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
2022-03-08 16:10:39 +00:00
Presubmit Automerger Backend
15d0cfed3a [automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783

Bug: 201519976
Change-Id: I308c520fe768dcfc1276c125e05c4203b39be2c7
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
2022-03-08 16:10:38 +00:00
Alex Johnston
bc4fd99ddb Change default USB configuration to a RestrictedPreference
Test: manual with TestDPC and Settings
      DefaultUsbConfigurationPreferenceControllerTest
Bug: 201519976
     205996517
Change-Id: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
2022-03-08 16:10:18 +00:00
PETER LIANG
ffd60718b2 Merge "Fix that the preview text in "Text and reading options" page is too small." into tm-dev am: 3ccdcd433a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106241

Change-Id: I802d641127336df06e15ed6448fb08c24cc5bceb
2022-03-08 15:46:37 +00:00
PETER LIANG
36d0d31cb5 Merge "Fix that the preview text in "Text and reading options" page is too small." into tm-dev am: 3ccdcd433a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106241

Change-Id: Ib5040227ea7698c0abafae1e3c718bafda2d9e77
2022-03-08 15:46:29 +00:00
Lucas Silva
d9071dea25 Add master toggle to enable/disable screen savers
The new control toggles the Settings.Secure.SCREENSAVER_ENABLED setting,
which controls if a screen saver is enabled. Also removed the "Never"
option from the WhenToDream picker, since this is now controlled via the
toggle.

Test: locally on device
Bug: 222360260
Change-Id: Ibcf52b5e2d1ad0c295f32c4c18bfc89082d074ce
2022-03-08 10:27:59 -05:00
PETER LIANG
3ccdcd433a Merge "Fix that the preview text in "Text and reading options" page is too small." into tm-dev 2022-03-08 15:17:10 +00:00
Marie Matheson
4af5f9b865 Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev am: 2adf0a066f am: 3f137b2106
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17107287

Change-Id: Iebad314ea1354813b68269ef51b4f7a2c8447e9f
2022-03-08 14:57:45 +00:00
Marie Matheson
386fdd46a4 Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev am: 2adf0a066f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17107287

Change-Id: I2211e10d3b8ad36c25a428d51c66d95c12e686f4
2022-03-08 14:34:33 +00:00
Marie Matheson
3f137b2106 Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev am: 2adf0a066f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17107287

Change-Id: I093d02d5424a6354484612b5199770d20cb47502
2022-03-08 14:33:20 +00:00
Julia Reynolds
856cc0da65 Fix app notification toggle
Test: CTS Verifier 'Notification Listener Test'
Bug: 222372861
Change-Id: I060b8b9bf7b749736596676a3d98cd609dc65846
2022-03-08 09:18:56 -05:00
Marie Matheson
2adf0a066f Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev 2022-03-08 14:02:57 +00:00
Etienne Ruffieux
8db7f1a81d Replced BluetoothCodecStatus creator by Builder
Bug: 222540543
Test: atest BluetoothCodecsTest
Tag: #feature
Change-Id: I2585b1bac9044add2dd072ed2effc3e61e4b1223
2022-03-08 13:35:07 +00:00
Yuri Ufimtsev
76989c745d Merge "Inject different User IDs into biometric utils" into tm-dev am: 1985e02488 am: 95a2bd08ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17104563

Change-Id: I83a593886fe8c6417a6ff5a8e3d4d83adcfed9e8
2022-03-08 12:57:57 +00:00
Yuri Ufimtsev
95a2bd08ab Merge "Inject different User IDs into biometric utils" into tm-dev am: 1985e02488
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17104563

Change-Id: Ib773f4a7bebcf7df7262558be8cd3d9a261860b5
2022-03-08 12:34:30 +00:00
Yuri Ufimtsev
2ea378651c Merge "Inject different User IDs into biometric utils" into tm-dev am: 1985e02488
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17104563

Change-Id: I63c748656f255d1d795558594a8d2b214bd98eee
2022-03-08 12:34:02 +00:00
Yuri Ufimtsev
1985e02488 Merge "Inject different User IDs into biometric utils" into tm-dev 2022-03-08 12:13:20 +00:00
Stanley Wang
3f9f876142 Merge "Fix the problem that voice search can not find the Use Battery Saver slice." into tm-dev am: 5e4be73398 am: f3e802f1d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17013484

Change-Id: I269968a5dbf1a17878b02afe2eb93379965762fd
2022-03-08 11:36:02 +00:00
TreeHugger Robot
8faca50c7d Merge "Change default USB configuration to a RestrictedPreference" into tm-dev am: 7d26b6273c am: f505ee9236
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17070264

Change-Id: I2c21994aa18b17ce2cce20fab6b685f0a497eaed
2022-03-08 11:35:04 +00:00
Stanley Wang
41f55133b0 Merge "Fix the problem that voice search can not find the Use Battery Saver slice." into tm-dev am: 5e4be73398
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17013484

Change-Id: I9d1052ebb2b997301659f8d34fbd5f335705d7ef
2022-03-08 11:08:44 +00:00
Stanley Wang
f3e802f1d7 Merge "Fix the problem that voice search can not find the Use Battery Saver slice." into tm-dev am: 5e4be73398
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17013484

Change-Id: I5cc7620247489909715876bfd27abbab4c73bfcc
2022-03-08 11:08:02 +00:00
TreeHugger Robot
e8c55967ec Merge "Change default USB configuration to a RestrictedPreference" into tm-dev am: 7d26b6273c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17070264

Change-Id: Id3aabcc991a52cbcd12b7edf892922f559dd65db
2022-03-08 11:08:01 +00:00
TreeHugger Robot
f505ee9236 Merge "Change default USB configuration to a RestrictedPreference" into tm-dev am: 7d26b6273c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17070264

Change-Id: I37dc0055304fd51eaa374a3f18f4ec205cd94b6e
2022-03-08 11:07:06 +00:00
Xin Li
0cf175a248 [automerger skipped] Merge "Merge Android 12L" am: 41790c684b -s ours am: 4ea5f0e2e9 -s ours
am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history

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

Change-Id: I27a745bdaa46d24d78ae8e50419c987a944cbb3e
2022-03-08 11:06:35 +00:00
Xin Li
d77cc96126 [automerger skipped] Merge Android 12L am: 821558107d -s ours am: 809f99056f -s ours
am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history

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

Change-Id: Ie0cf9b959ab83a2cb9a838cfda6ee74375483a78
2022-03-08 11:03:49 +00:00
Stanley Wang
5e4be73398 Merge "Fix the problem that voice search can not find the Use Battery Saver slice." into tm-dev 2022-03-08 10:30:03 +00:00
TreeHugger Robot
7d26b6273c Merge "Change default USB configuration to a RestrictedPreference" into tm-dev 2022-03-08 10:29:42 +00:00
Xin Li
4ea5f0e2e9 [automerger skipped] Merge "Merge Android 12L" am: 41790c684b -s ours
am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history

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

Change-Id: I73dcd25ab649c74543ba7a30c86bc5752648a624
2022-03-08 10:21:48 +00:00
Xin Li
809f99056f [automerger skipped] Merge Android 12L am: 821558107d -s ours
am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history

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

Change-Id: I044bf2318465b13d4b88093402659c46e6575f65
2022-03-08 10:18:58 +00:00
Stanley Wang
21564efa8b Fix the problem that voice search can not find the
Use Battery Saver slice.

There is no title for preference in xml, so the preference cannot
be indexed.

Fix: 172276695
Test: manual test and see the UI
Change-Id: Ieb7836805e66515629064800e4119ca17b5ac2e0
2022-03-08 08:51:58 +00:00