Eric Biggers
e5f0f5cb80
[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: Id76d2735e954d7f741389bbe81aedc8d5ee02d04
2022-03-09 12:13:34 +00:00
Eric Biggers
b2b9447298
[automerger skipped] Merge changes from topic "remove-fde" am: 12ba0209a2
am: fa38c498dc
-s ours am: e5f19ebc15
-s ours am: 323c5416ed
-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: I21ffed0493ea473e355cacdd2ab60f6755090a94
2022-03-09 12:10:15 +00:00
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
Xin Li
89754d4438
[automerger skipped] Merge "Merge Android 12L" am: 41790c684b
-s ours am: 4ea5f0e2e9
-s ours am: 0cf175a248
-s ours am: 41a3026a47
-s ours am: e59429af7c
-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: Id989d9d1c765b602227eafaab7bb3ba76bf041ac
2022-03-09 12:09:05 +00:00
Xin Li
564d9e9bfe
[automerger skipped] Merge Android 12L am: 821558107d
-s ours am: 809f99056f
-s ours am: d77cc96126
-s ours am: df5b4f0bad
-s ours am: a28772f40c
-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: Ib3aa728dfb0f2b8bd013d52429d62854fc594395
2022-03-09 12:06:21 +00:00
Eric Biggers
16c7c0ed8c
[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: Iac3db43ea9ee6dc10a1bec2901223cf691cfa898
2022-03-09 12:05:09 +00:00
Eric Biggers
11e5b82bda
[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: I5781e13e130dd47cb7e3efd19ac5c049dc3b8bf5
2022-03-09 12:05:08 +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
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
Xin Li
ab2c19060a
[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: I76e1a3a90dbbc87c8b66430bc2820c5fd5e0a428
2022-03-09 11:39:13 +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
41e491e996
[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: I0859a350336c9d772d11876abc1891744bb8b975
2022-03-09 11:36:29 +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
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
Hugh Chen
7b5f8ad883
RESTRICT AUTOMERGE Implement Spatial Audio and Head Tracking option in bluetooth settings
...
Implemented the Spatial Audio and Head Tracking options, make these
features could be controlled in bluetooth detail settings.
Bug: 218960300
Test: make -j64 RunSettingsRoboTests
Change-Id: I880cc7a10fc5e2fa5d1052fff5a7b589a4ff60df
(cherry picked from commit bc2f30ca67
)
2022-03-09 11:02:34 +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
Kaiqiang Wang
f41b0abd7d
Audio Description preference updates according to IC reviewing:
...
1) Update audio description preference summary as the Legal team
suggestion as b/194376036#comment6
2) Move audio description preference item under "Audio" category as the
UX team suggestions as b/194376037#comment#9
Preview: https://screenshot.googleplex.com/C24snywjHaRwG3g
Bug: 194376037
Bug: 194376036
Bug: 214634651
Test: local test
Change-Id: Ic72be85120bcf2fd36599cd9aad82b50aad32d04
2022-03-09 09:55:15 +00:00
Arc Wang
e1aeacad6a
Fix NullPointerException at ManageApplications$ApplicationsAdapter.access
...
mApplications may be null and should check if it's null before accessing.
Bug: 217872983
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ManageApplicationsTest
Change-Id: I97a26e26478eb239370cdef8c44342cd7aeb71ee
2022-03-09 17:52:34 +08:00
lucaslin
ceca247252
Hide private DNS settings UI in Guest mode am: 52e863b5a2
am: 2c1c76cd35
am: 14e88ca2f9
am: 652527b496
am: b38110f853
am: 877041d409
am: e6e7a62cd7
am: 865c0db40e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I99a8348b2a72bb4121fdbac6b375cc92db4369d9
2022-03-09 09:36:31 +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
d671e4498e
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: I7d2814f9e77113e36582f86c823a24cac2ba8aee
2022-03-09 09:11:26 +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
tom hsu
6fc5bb64dc
[Panlingual] Revamp the panlingual UI in Settings.
...
- Create a Activity to contain AppLocaleDetail and
LocalePickerWithRegion
- Update the Entry from apps language page
Bug: 223089715
Test: local test pass
Change-Id: Id01e93f3df32412c7323ca577a149009eb1862ad
2022-03-09 17:06:33 +08:00
Les Lee
3bb2a81042
wifi setting: Add psk length check
...
Frameworks move psk ascii password length check from API level to
framework internal. Add the check code in Setting side to avoid breaking
the unit test.
Bug: 223513510
Test: atest -c WifiUtilsTest
Change-Id: I7c78eb367fdcbbc11bbb7169ba8f2edc720ad071
2022-03-09 16:28:30 +08: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
menghanli
b1a76d63a6
Update accessibility button and gesture footer text for usability
...
Bug: 218409088
Test: Manual testing
Change-Id: Ie18d00c371bb0e474b002990bc3ca7d0d7d9afd0
2022-03-09 13:51:46 +08:00
Tsung-Mao Fang
2e82606f14
[automerger skipped] Merge "Rename back button to navigate up button" into tm-dev am: 8c3eb0d616
am: 1593958bf9
-s ours
...
am skip reason: Merged-In I23bc580b193cc891b659514d13705db2c55b756a with SHA-1 00cbd72c60
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17103048
Change-Id: I31744754ca1a18c6fda38293a48b793909033461
2022-03-09 05:05:02 +00:00
Tsung-Mao Fang
e70e74d79b
[automerger skipped] Merge "Rename back button to navigate up button" into tm-dev am: 8c3eb0d616
-s ours
...
am skip reason: Merged-In I23bc580b193cc891b659514d13705db2c55b756a with SHA-1 692c47e153
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17103048
Change-Id: I0c1b6ffe33d53ca0ea1a4d390e96133e795fd50c
2022-03-09 04:40:48 +00:00
Tsung-Mao Fang
f8c78e8019
[automerger skipped] Rename back button to navigate up button am: 00cbd72c60
-s ours
...
am skip reason: Merged-In I23bc580b193cc891b659514d13705db2c55b756a with SHA-1 692c47e153
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17103048
Change-Id: I319f4e3d83edb4f85a53cd57cb6401067f69d405
2022-03-09 04:40:46 +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