TreeHugger Robot
c91fc6adf0
[automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-mainline-prod am: 71ded27df2
-s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I3e7dedf3263d073e833a4cd02c306eb1f888b340
2022-03-09 18:12:00 +00:00
TreeHugger Robot
201fb5043a
Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into tm-dev
...
* changes:
[automerged blank] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
2p: 407022ff92
[automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
Change default USB configuration to a RestrictedPreference
2022-03-09 17:54:27 +00:00
TreeHugger Robot
71ded27df2
Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-mainline-prod
...
* changes:
[automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
Change default USB configuration to a RestrictedPreference
2022-03-09 17:54:27 +00:00
Christian Göllner
5ff63a569c
Merge "Device state auto-rotation settings: log device state specific state changes" into tm-dev
2022-03-09 15:12:38 +00:00
Christian Göllner
982f5507c7
Device state auto-rotation settings: log device state specific state changes
...
Bug: 221254073
Test: manually + unit tests
Change-Id: Ie8c0d1489d63fd2d19ad604816150b51ede4bb3b
2022-03-09 13:00:55 +00:00
Etienne Ruffieux
cd09f9cbda
Merge "Replced BluetoothCodecStatus creator by Builder" am: 5dd7c32f93
am: 1a8bbc4a85
am: b60c038016
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2015316
Change-Id: I560704cca582ef3e27638bb6df3693c71adbd874
2022-03-09 11:43:28 +00:00
Etienne Ruffieux
b60c038016
Merge "Replced BluetoothCodecStatus creator by Builder" am: 5dd7c32f93
am: 1a8bbc4a85
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2015316
Change-Id: Idd8a5be969d228f501c245d81bdc09b3496f7f5a
2022-03-09 11:32:11 +00:00
lucaslin
40086edf3f
Hide private DNS settings UI in Guest mode am: 52e863b5a2
am: 2c1c76cd35
am: 14e88ca2f9
am: 652527b496
am: b38110f853
am: 92245b8f57
am: 1264191233
am: 51c66e24f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I5f3bda846d5193d5de7d39a393d80b2105a80c26
2022-03-09 11:25:23 +00:00
Eric Biggers
323c5416ed
[automerger skipped] Merge changes from topic "remove-fde" am: 12ba0209a2
am: fa38c498dc
-s ours am: e5f19ebc15
-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: I7de40361eddca0640dd14c8033253cd1fc1ff7bd
2022-03-09 11:20:50 +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
Etienne Ruffieux
1a8bbc4a85
Merge "Replced BluetoothCodecStatus creator by Builder" am: 5dd7c32f93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2015316
Change-Id: Ia92b2ac01bf3e9862738d2c40ae53bf97da35759
2022-03-09 11:01:57 +00:00
Etienne Ruffieux
5dd7c32f93
Merge "Replced BluetoothCodecStatus creator by Builder"
2022-03-09 10:24:16 +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
51c66e24f3
Hide private DNS settings UI in Guest mode am: 52e863b5a2
am: 2c1c76cd35
am: 14e88ca2f9
am: 652527b496
am: b38110f853
am: 92245b8f57
am: 1264191233
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I2f039885b8cb3823cb7da5031ef7931d587564f1
2022-03-09 09:11:08 +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
1264191233
Hide private DNS settings UI in Guest mode am: 52e863b5a2
am: 2c1c76cd35
am: 14e88ca2f9
am: 652527b496
am: b38110f853
am: 92245b8f57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: Iadd14a41d26647e13d1f751947d91f3f2a360e84
2022-03-09 08:20:16 +00:00
lucaslin
92245b8f57
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: I6947b1c6fb64bf4603ee665ebc44d53fb8f8b77d
2022-03-09 07:44:37 +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
8c3eb0d616
Merge "Rename back button to navigate up button" into tm-dev
2022-03-09 04:12:55 +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
42e400e1cd
Merge "Make icons show up on DND bypassing apps page" into tm-dev
2022-03-08 22:35:43 +00:00
Julia Reynolds
d9b15d803d
Merge "Fix app notification toggle" into tm-dev
2022-03-08 21:11:47 +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
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
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