Xinyi Zhou
e8d3c4290a
Use FAST_PAIR_SCAN_ENABLED in Nearby Manager
...
Fix: 216590902
Bug: 223370810
Test: Flashed and confirmed logs
Change-Id: I843c416f4f02d66c314f07109cdf8e56ed2edb66
2022-03-08 23:09:55 +00:00
Yuri Lin
fb671e9b3a
Merge "Make icons show up on DND bypassing apps page" into tm-dev am: 42e400e1cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17105922
Change-Id: Ia14ce9ca9d50579f0b4eb090f0a3e03e24f1c0da
2022-03-08 23:03:45 +00:00
Yuri Lin
42e400e1cd
Merge "Make icons show up on DND bypassing apps page" into tm-dev
2022-03-08 22:35:43 +00:00
Julia Reynolds
70d2250b94
Merge "Fix app notification toggle" into tm-dev am: d9b15d803d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17122328
Change-Id: Ifb975438756e2bd1080c38404f984b2b5c7a95d8
2022-03-08 21:12:20 +00:00
Julia Reynolds
d9b15d803d
Merge "Fix app notification toggle" into tm-dev
2022-03-08 21:11:47 +00:00
Jernej Virag
b56f603f93
Merge "Add animation to button navigation settings page" into tm-dev am: 77c4aab5d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17074572
Change-Id: I08364e3d3a936ba9f04d8371e88e169b4a9ef85b
2022-03-08 20:09:23 +00:00
TreeHugger Robot
17213596a7
Merge "Fix WhenToDreamPickerTest and re-enable." into tm-dev am: 9ceec097b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17123847
Change-Id: Ia1d5a6a6c3331366505d471ce00fa730c98a6490
2022-03-08 20:08:58 +00:00
Jernej Virag
77c4aab5d5
Merge "Add animation to button navigation settings page" into tm-dev
2022-03-08 20:01:32 +00:00
Yuri Lin
e8e40609df
Make icons show up on DND bypassing apps page
...
This change uses the app icon cache to either get the icon from cache or retrieve it on a background thread. The methods previously used to get app icons no longer work in T.
Bug: 222323742
Test: manual
Change-Id: I4960a9297d546cac088e5969a8903391ed994bd4
2022-03-08 14:57:54 -05:00
TreeHugger Robot
9ceec097b1
Merge "Fix WhenToDreamPickerTest and re-enable." into tm-dev
2022-03-08 19:44:26 +00:00
Eric Biggers
e5f19ebc15
[automerger skipped] Merge changes from topic "remove-fde" am: 12ba0209a2
am: fa38c498dc
-s ours
...
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 1d48df59e5
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945501
Change-Id: I4dc70b56c7a568fa10dfd43a422ccf884690f2bf
2022-03-08 19:34:15 +00:00
Eric Biggers
799f84fd1c
[automerger skipped] Rename crypt_keeper_* strings that are still used am: 64dc746a68
am: cc91b63c1e
-s ours
...
am skip reason: Merged-In Ic63910c870837f5b37e4407ba5b3c7629e925c17 with SHA-1 6167665b8f
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945500
Change-Id: Ia7dc1f1dd76688109812a9daf3c12350c287e2a3
2022-03-08 19:34:13 +00:00
Eric Biggers
31509c8d31
[automerger skipped] Remove CryptKeeperSettings am: 922a11f659
am: 8ec618fc14
-s ours
...
am skip reason: Merged-In I3ce9894291ea1f1886f21980a86a92bfce38038a with SHA-1 9b18c5d081
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945499
Change-Id: I47515daecb8ac43371ad45e08ffd2eafb744d250
2022-03-08 19:34:12 +00:00
Eric Biggers
2ff19ce69b
[automerger skipped] Remove CryptKeeper am: 438c3af097
am: 94ebb2e9e5
-s ours
...
am skip reason: Merged-In I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9 with SHA-1 f8ca0a448c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945498
Change-Id: Ib73b9312a040da6c953f4335b759f4cc638507f1
2022-03-08 19:34:10 +00:00
Eric Biggers
fa38c498dc
Merge changes from topic "remove-fde" am: 12ba0209a2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945501
Change-Id: I3dbcdd90b3ed14925efa3990d3ce5fa2bab8e0a5
2022-03-08 19:04:13 +00:00
Eric Biggers
cc91b63c1e
Rename crypt_keeper_* strings that are still used am: 64dc746a68
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945500
Change-Id: I48310f08c631cf9e88aae449701cb78e51ae852e
2022-03-08 19:04:11 +00:00
Eric Biggers
8ec618fc14
Remove CryptKeeperSettings am: 922a11f659
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945499
Change-Id: Ib992c8f76022237f088f8cef402fa99e125c9c83
2022-03-08 19:04:10 +00:00
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
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
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
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
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
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
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
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
1985e02488
Merge "Inject different User IDs into biometric utils" into tm-dev
2022-03-08 12:13:20 +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
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