Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,743 Commits 1 Branch 0 Tags
16808d4a6353a71fab94636d76e6acef29cf2ae0
Commit Graph

100743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
a00c327707 Merge changes from topic "remove-fde" into sc-v2-dev-plus-aosp 
* changes:
  Remove FDE support from accessibility settings
  Rename crypt_keeper_* strings that are still used
  Remove CryptKeeperSettings
  Remove CryptKeeper
 2022-03-08 17:11:15 +00:00
PETER LIANG
36d0d31cb5 Merge "Fix that the preview text in "Text and reading options" page is too small." into tm-dev am: 3ccdcd433a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106241

Change-Id: Ib5040227ea7698c0abafae1e3c718bafda2d9e77
 2022-03-08 15:46:29 +00:00
Lucas Silva
d9071dea25 Add master toggle to enable/disable screen savers 
The new control toggles the Settings.Secure.SCREENSAVER_ENABLED setting,
which controls if a screen saver is enabled. Also removed the "Never"
option from the WhenToDream picker, since this is now controlled via the
toggle.

Test: locally on device
Bug: 222360260
Change-Id: Ibcf52b5e2d1ad0c295f32c4c18bfc89082d074ce
 2022-03-08 10:27:59 -05:00
PETER LIANG
3ccdcd433a Merge "Fix that the preview text in "Text and reading options" page is too small." into tm-dev 2022-03-08 15:17:10 +00:00
Marie Matheson
3f137b2106 Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev am: 2adf0a066f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17107287

Change-Id: I093d02d5424a6354484612b5199770d20cb47502
 2022-03-08 14:33:20 +00:00
Julia Reynolds
856cc0da65 Fix app notification toggle 
Test: CTS Verifier 'Notification Listener Test'
Bug: 222372861
Change-Id: I060b8b9bf7b749736596676a3d98cd609dc65846
 2022-03-08 09:18:56 -05:00
Marie Matheson
2adf0a066f Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev 2022-03-08 14:02:57 +00:00
Yuri Ufimtsev
95a2bd08ab Merge "Inject different User IDs into biometric utils" into tm-dev am: 1985e02488 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17104563

Change-Id: Ib773f4a7bebcf7df7262558be8cd3d9a261860b5
 2022-03-08 12:34:30 +00:00
Yuri Ufimtsev
1985e02488 Merge "Inject different User IDs into biometric utils" into tm-dev 2022-03-08 12:13:20 +00:00
Stanley Wang
f3e802f1d7 Merge "Fix the problem that voice search can not find the Use Battery Saver slice." into tm-dev am: 5e4be73398 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17013484

Change-Id: I5cc7620247489909715876bfd27abbab4c73bfcc
 2022-03-08 11:08:02 +00:00
TreeHugger Robot
f505ee9236 Merge "Change default USB configuration to a RestrictedPreference" into tm-dev am: 7d26b6273c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17070264

Change-Id: I37dc0055304fd51eaa374a3f18f4ec205cd94b6e
 2022-03-08 11:07:06 +00:00
Xin Li
0cf175a248 [automerger skipped] Merge "Merge Android 12L" am: 41790c684b -s ours am: 4ea5f0e2e9 -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: I27a745bdaa46d24d78ae8e50419c987a944cbb3e
 2022-03-08 11:06:35 +00:00
Xin Li
d77cc96126 [automerger skipped] Merge Android 12L am: 821558107d -s ours am: 809f99056f -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: Ie0cf9b959ab83a2cb9a838cfda6ee74375483a78
 2022-03-08 11:03:49 +00:00
Stanley Wang
5e4be73398 Merge "Fix the problem that voice search can not find the Use Battery Saver slice." into tm-dev 2022-03-08 10:30:03 +00:00
TreeHugger Robot
7d26b6273c Merge "Change default USB configuration to a RestrictedPreference" into tm-dev 2022-03-08 10:29:42 +00:00