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
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
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
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
c42eb756b7
[automerger skipped] Merge "Restrict WiFi network connection" into tm-dev am: 35484ee87a
am: ac5bdb033c
-s ours
...
am skip reason: Merged-In I04aafaa5b383598a0f87eea15d06b38bbc662b9e with SHA-1 190d871520
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106546
Change-Id: I01c7ce56d5b75a096c9f3b8746adb0fe8121b1f5
2022-03-09 03:53:11 +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
480454aaf2
[automerger skipped] Merge "Restrict WiFi network connection" into tm-dev am: 35484ee87a
-s ours
...
am skip reason: Merged-In I04aafaa5b383598a0f87eea15d06b38bbc662b9e with SHA-1 f86bdc9c69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106546
Change-Id: I16ad9a5b8148b1cdb6995692b8da27d511323fa3
2022-03-09 03:26:41 +00:00
Weng Su
ccbdbe3e07
[automerger skipped] Restrict WiFi network connection am: 190d871520
-s ours
...
am skip reason: Merged-In I04aafaa5b383598a0f87eea15d06b38bbc662b9e with SHA-1 f86bdc9c69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106546
Change-Id: Ie2b29982e6ec0c6072d33e684a246b1174471e3d
2022-03-09 03:26:39 +00:00
Chaohui Wang
b4c3817a65
Fix App Compatibility Settings' lifecycle
...
When "Don't keep activities" enabled, it used to be unusable.
Bug: 222226636
Test: On Pixel device
Change-Id: I11718bea90cecfb7ee455fba9059bb09ffb72016
2022-03-09 03:05:47 +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
a056385522
Merge "Make icons show up on DND bypassing apps page" into tm-dev am: 42e400e1cd
am: fb671e9b3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17105922
Change-Id: I6b4cf018505a89596ff5b824126f6187d716bfe7
2022-03-08 23:27:26 +00:00
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
23a2a0d85b
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: I79d52f3b60aa7fc871262c971f7aefb33953f868
2022-03-08 23:04:29 +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
32bfdce31c
Merge "Fix app notification toggle" into tm-dev am: d9b15d803d
am: 70d2250b94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17122328
Change-Id: I904cb7fb1990a0416ad75be3550f2f9212766fb7
2022-03-08 21:15:27 +00:00
Julia Reynolds
0464bcc336
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: I41ad0e99926726af785e8f64992ad2432661e56f
2022-03-08 21:12:47 +00:00