Commit Graph

100758 Commits

Author SHA1 Message Date
Eric Biggers
2a1473fa93 [automerger skipped] Rename crypt_keeper_* strings that are still used am: 64dc746a68 am: cc91b63c1e -s ours am: 799f84fd1c -s ours am: af1aa542b0 -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: I00902cf223d3d52319e8b38a7ca3f47aadbc351b
2022-03-09 12:10:14 +00:00
Eric Biggers
96663e9e76 [automerger skipped] Remove CryptKeeperSettings am: 922a11f659 am: 8ec618fc14 -s ours am: 31509c8d31 -s ours am: 3bc698a145 -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: Ia16ed30f4f7785cf4dc7c5f076801acb9489e4ab
2022-03-09 12:10:13 +00:00
Eric Biggers
4ceb98220c [automerger skipped] Remove CryptKeeper am: 438c3af097 am: 94ebb2e9e5 -s ours am: 2ff19ce69b -s ours am: da5edda772 -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: I682b46584c44fb12453dcc13f6e96472f2c3eed2
2022-03-09 12:10:12 +00:00
Eric Biggers
16808d4a63 [automerger skipped] Merge changes from topic "remove-fde" into sc-v2-dev-plus-aosp am: a00c327707 -s ours am: e92bac3118 -s ours
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 b4060ef65b is already in history

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

Change-Id: I016484f655421273710796b664d86657c412cf02
2022-03-09 11:58:55 +00:00
Eric Biggers
ba01b74178 [automerger skipped] Remove FDE support from accessibility settings am: 1d48df59e5 -s ours am: 7e34dd199d -s ours
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 b4060ef65b is already in history

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

Change-Id: I023f575212821f4e1cc2b2216a35326d55cfb8a1
2022-03-09 11:58:54 +00:00
Xin Li
e59429af7c [automerger skipped] Merge "Merge Android 12L" am: 41790c684b -s ours am: 4ea5f0e2e9 -s ours am: 0cf175a248 -s ours am: 41a3026a47 -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: Ie035654785c0543a0ecab68d7055f8c057907102
2022-03-09 11:39:04 +00:00
Xin Li
a28772f40c [automerger skipped] Merge Android 12L am: 821558107d -s ours am: 809f99056f -s ours am: d77cc96126 -s ours am: df5b4f0bad -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: Ibc71753cdb93a05fa418558f1306d6ad6fc9c382
2022-03-09 11:36:16 +00:00
Eric Biggers
af1aa542b0 [automerger skipped] Rename crypt_keeper_* strings that are still used am: 64dc746a68 am: cc91b63c1e -s ours am: 799f84fd1c -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: Ie9fdc26f0dafbb159a2d9b956241f93dac4a9003
2022-03-09 11:20:49 +00:00
Eric Biggers
3bc698a145 [automerger skipped] Remove CryptKeeperSettings am: 922a11f659 am: 8ec618fc14 -s ours am: 31509c8d31 -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: I2aa8009d3bac8b5786c4414811b854df39ad53f3
2022-03-09 11:20:47 +00:00
Eric Biggers
da5edda772 [automerger skipped] Remove CryptKeeper am: 438c3af097 am: 94ebb2e9e5 -s ours am: 2ff19ce69b -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: Ib5c44454b76f8216dd306ba7cd3d398df18cd50e
2022-03-09 11:20:43 +00:00
Eric Biggers
e92bac3118 [automerger skipped] Merge changes from topic "remove-fde" into sc-v2-dev-plus-aosp am: a00c327707 -s ours
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 b4060ef65b is already in history

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

Change-Id: I14de20d1a38920b7ef95b8c4064d58ecef16de55
2022-03-09 11:02:25 +00:00
Eric Biggers
7e34dd199d [automerger skipped] Remove FDE support from accessibility settings am: 1d48df59e5 -s ours
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 b4060ef65b is already in history

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

Change-Id: I163caafba29110cfa8f7c85df2f7570cc9a67e20
2022-03-09 11:02:22 +00:00
Xin Li
41a3026a47 [automerger skipped] Merge "Merge Android 12L" am: 41790c684b -s ours am: 4ea5f0e2e9 -s ours am: 0cf175a248 -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: I9b778e2ccbaf36fc7f4ad2ae72a6ff008396d11a
2022-03-09 10:05:06 +00:00
Xin Li
df5b4f0bad [automerger skipped] Merge Android 12L am: 821558107d -s ours am: 809f99056f -s ours am: d77cc96126 -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: I3e48708566265d7ab545766f6c26b27a78aad3f2
2022-03-09 10:02:19 +00:00
lucaslin
865c0db40e Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 am: b38110f853 am: 877041d409 am: e6e7a62cd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I8cb6ac037328d3c078c1c5cfdf89d5d118088be6
2022-03-09 09:12:35 +00:00
lucaslin
e6e7a62cd7 Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 am: b38110f853 am: 877041d409
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I5fb3d882edff57eada1752d2c1428043c8b581fa
2022-03-09 08:21:05 +00:00
lucaslin
877041d409 Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 am: b38110f853
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I96334218dfed096c2dd9509caeaf34ff46a08b09
2022-03-09 07:43:46 +00:00
lucaslin
b38110f853 Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I7dfbfc73a887027bb55712e2ea05fd01e65bcf96
2022-03-09 07:20:30 +00:00
lucaslin
652527b496 Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I8d31577fb64d959949b1c2aed51e482cb54a57ac
2022-03-09 06:55:34 +00:00
lucaslin
14e88ca2f9 Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I417c9687ae22749f428a902a01612c50cbf0e52c
2022-03-09 06:32:20 +00:00
lucaslin
2c1c76cd35 Hide private DNS settings UI in Guest mode am: 52e863b5a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I5fc7b5001299b8831a1dd9440b6e25dfaf6d8a98
2022-03-09 06:08:16 +00:00
Tsung-Mao Fang
1593958bf9 Merge "Rename back button to navigate up button" into tm-dev am: 8c3eb0d616
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17103048

Change-Id: I8ff8475b95262fb176af4a86cab8f8876f52c282
2022-03-09 04:40:20 +00:00
Tsung-Mao Fang
8c3eb0d616 Merge "Rename back button to navigate up button" into tm-dev 2022-03-09 04:12:55 +00:00
TreeHugger Robot
ac5bdb033c Merge "Restrict WiFi network connection" into tm-dev am: 35484ee87a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106546

Change-Id: Icc0a1a524902cb88327385273c6ef15c48f87d1f
2022-03-09 03:27:04 +00:00
TreeHugger Robot
35484ee87a Merge "Restrict WiFi network connection" into tm-dev 2022-03-09 03:03:05 +00:00
lucaslin
52e863b5a2 Hide private DNS settings UI in Guest mode
Hide private DNS settings UI in Guest mode to prevent guest
users modifying global private DNS settings.

Bug: 206987762
Test: 1. make RunSettingsRoboTests \
         ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
      2. Switch to Guest user and check if the private DNS UI is
         hidden or not.
Change-Id: Iebfb8684da3be32110decd9e8447dd07b1c40387
2022-03-09 02:54:12 +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
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
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
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