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
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
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
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
Yasin Kilicdere
a366493c2c
Merge "Update UI to show feedback while creating Guest from Settings." into tm-dev am: 161697beef
am: f9dd9ebfd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17084564
Change-Id: Ieef0e3547b1a312cc306378124deaea562f26eaa
2022-03-08 18:04:02 +00:00
Lucas Silva
0a250a7b08
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: Ib20008f61d7f1cad6e0dc9bf23d0101b5fb2054a
2022-03-08 18:03:54 +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
Ricky Wai
18602ea97a
Show lock icon in restricted settings dialog
...
Bug: 221847335
Test: After applying restricted settings, the dialog shows the icon now.
Change-Id: If4b55d4320956625141973c337ae7ef2a3bd8dbc
2022-03-08 17:58:13 +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
76feaa60a7
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: I8b9bca2cd491d1775760b9c8de16adf915953ebe
2022-03-08 17:49:04 +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