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
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
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
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
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
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
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
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
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
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
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
d42b5aa635
Merge "Add animation to button navigation settings page" into tm-dev am: 77c4aab5d5 am: b56f603f93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17074572
Change-Id: I3017781ee848eb5ee0f94e993209b9228500097e
2022-03-08 20:51:15 +00:00
TreeHugger Robot
adb748003e
Merge "Fix WhenToDreamPickerTest and re-enable." into tm-dev am: 9ceec097b1 am: 17213596a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17123847
Change-Id: Ib43245f0cd363bbe3b47c188d06dc843efa2b278
2022-03-08 20:48:22 +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
Jernej Virag
e24f7471a4
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: I70681bf6cca0e8cdf3e4d164b72e6029a19d0d4e
2022-03-08 20:09:08 +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
TreeHugger Robot
a147c20182
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: Ib5719f0716275a562160a0ed646a3709cf589f5d
2022-03-08 20:08:32 +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
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
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
14aa9069fa
Merge "Add master toggle to enable/disable screen savers" into tm-dev am: b048c37062 am: 5d51ce5990
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17073795
Change-Id: I0e3803edd5cea7bd5185e5a067924676c02a5a4a
2022-03-08 18:13:49 +00:00