PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,324 Commits 1 Branch 0 Tags
a52bf99fd1aa8824d08e074c8a3066bdecde1e9e
Commit Graph

81324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Menghan Li
a52bf99fd1 Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev am: 1576980095 am: 3e0080956d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299189

Change-Id: Icbd6b911a29aac29b41f21b45bd24e507ff9e0fe
 2021-04-30 00:12:58 +00:00
Menghan Li
3e0080956d Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev am: 1576980095 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299189

Change-Id: Ic5d918e2ee2ffced61e5ab9f1011411c4e95094a
 2021-04-29 23:52:07 +00:00
Menghan Li
1576980095 Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev 2021-04-29 23:23:34 +00:00
Almaz Mingaleev
af9aa076df Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev am: c51cefb2b9 am: e291bcfdd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353668

Change-Id: If2adfb297a40cdc4decdd183092a514f56fb46d0
 2021-04-29 20:11:51 +00:00
Almaz Mingaleev
e291bcfdd8 Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev am: c51cefb2b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353668

Change-Id: Ib087abea81bfb49d0ebd6b30a8ac96de4bd1d989
 2021-04-29 19:49:46 +00:00
Almaz Mingaleev
c51cefb2b9 Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev 2021-04-29 19:09:37 +00:00
Almaz Mingaleev
ac584f2911 Place GeoTZ toggle under auto time zone toggle. 
This moves the two toggles that control the time zone detection
behavior next to each other, rather than having them either side
of the current device time zone. This is intended to making it
clear they are both influencing detection behavior. It will ensure
that future text we put under the auto time zone toggle for the
tablet use case (where there is no telephony detection) explaining
that "Use location to set time zone" has to be on will be right
next to the toggle that needs to change.

Bug: 152746236
Bug: 186625820
Test: flashed device, checked manually
Change-Id: Ifd43db3d5cc7e764b12f8da20e552b1a5479ac4a
 2021-04-29 18:43:27 +00:00
Yi Jiang
240ef2d1e1 Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: 16b0f660ae am: 2b25a6cec4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114425

Change-Id: I0b72a2f0dc742efad756a84212786820c4cb22dc
 2021-04-29 17:47:42 +00:00
Amit Mahajan
93b4b46cf2 Merge "Fix incorrect logging." into sc-dev am: 6402ac45e6 am: 748bbd8a06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330728

Change-Id: If36d6a5884bfbc76ebf52736b864cc50ecaf6ff9
 2021-04-29 17:46:56 +00:00
Yi Jiang
2b25a6cec4 Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: 16b0f660ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114425

Change-Id: I1e5b63729f31d7d0e9fdd64c2b8bf500fe25edba
 2021-04-29 17:23:43 +00:00
Yi Jiang
16b0f660ae Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev 2021-04-29 17:19:34 +00:00
Amit Mahajan
748bbd8a06 Merge "Fix incorrect logging." into sc-dev am: 6402ac45e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330728

Change-Id: I19bdf202606748de850fc68fa2abf7c1b58ab197
 2021-04-29 17:16:13 +00:00
Amit Mahajan
6402ac45e6 Merge "Fix incorrect logging." into sc-dev 2021-04-29 16:54:06 +00:00
Matt Pietal
d17b6d022a Merge "SUW - Apply theme to FRP PIN pages" into sc-dev am: 0ddacf1152 am: eadf475e12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339991

Change-Id: I566e454c3ff2349f34574f9aa9bd423295167bd8
 2021-04-29 12:36:28 +00:00
Matt Pietal
eadf475e12 Merge "SUW - Apply theme to FRP PIN pages" into sc-dev am: 0ddacf1152 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339991

Change-Id: I8480d5b9775393c969026b7932b23551cd7f639d
 2021-04-29 12:20:17 +00:00
Matt Pietal
0ddacf1152 Merge "SUW - Apply theme to FRP PIN pages" into sc-dev 2021-04-29 12:04:44 +00:00
Tom Hsu
7c7f779b71 Merge "[ApnEditor] Create another string id for translation" into sc-dev am: 58fb70f8d6 am: 0a930e3e91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327014

Change-Id: Ib1183617dff27afb93de5359529fe0388d58e6da
 2021-04-29 09:31:10 +00:00
Wesley Wang
37fa9c79fc Merge "Make app usage page active time support time period" into sc-dev am: 04e14e41f0 am: ec3961fab1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297857

Change-Id: I3fa96de61655f440698b4091318976860965c2b9
 2021-04-29 09:30:49 +00:00
Tom Hsu
0a930e3e91 Merge "[ApnEditor] Create another string id for translation" into sc-dev am: 58fb70f8d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327014

Change-Id: I34cdfcd694606fcddad85d689a68e5c049df6f89
 2021-04-29 09:24:36 +00:00
Wesley Wang
ec3961fab1 Merge "Make app usage page active time support time period" into sc-dev am: 04e14e41f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297857

Change-Id: Idfc4fda23a670fe7a2de255818af13daf14c3910
 2021-04-29 09:23:44 +00:00
Tsung-Mao Fang
96a4e396fb [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 697a73dfdf -s ours am: c12e5f2455 -s ours am: ea699a1d2c -s ours am: 2e807e4f0b -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: I2548ce0d6e6715166176786dafb69eac04cdc09f
 2021-04-29 09:22:31 +00:00
Tsung-Mao Fang
7e98abea92 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 656dcf8334 -s ours am: 5fb1fd0ca8 -s ours am: bb4c367e7d -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: Ie56b7847a6c01df06a8057c068739a1918d46a40
 2021-04-29 09:22:10 +00:00
Tom Hsu
58fb70f8d6 Merge "[ApnEditor] Create another string id for translation" into sc-dev 2021-04-29 09:16:20 +00:00
Wesley Wang
04e14e41f0 Merge "Make app usage page active time support time period" into sc-dev 2021-04-29 09:07:17 +00:00
Tsung-Mao Fang
2e807e4f0b [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 697a73dfdf -s ours am: c12e5f2455 -s ours am: ea699a1d2c -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: Ibc1608e81ae7764ee22cda3c10e9620c7e8650be
 2021-04-29 09:00:16 +00:00
Tsung-Mao Fang
bb4c367e7d [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 656dcf8334 -s ours am: 5fb1fd0ca8 -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: Iec283f108fe57611ce83ea68bb3e34e3472b9d8c
 2021-04-29 08:59:50 +00:00
Tsung-Mao Fang
ea699a1d2c [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 697a73dfdf -s ours am: c12e5f2455 -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: I0582443b7085bc7c18289033f59dbb60c7b05540
 2021-04-29 08:59:00 +00:00
Yi Jiang
20d1da2b62 Fixes 'no ripple effect' issue for screen attention setting 
Preferences shouldn't be initialized at onAttach() because the settings
style hasn't been loaded yet. This change defers the preferences
initialization so that they comply with the settings style.

Test: manually
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.display
Bug: 183909540

Change-Id: I4dc4503924a1dcd5b8d41f7d27e576befb11f976
 2021-04-29 01:28:35 -07:00
Tsung-Mao Fang
5fb1fd0ca8 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 656dcf8334 -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: If58e6e4b79671712637d7cfb65a1ec58fc654504
 2021-04-29 08:16:29 +00:00
Tsung-Mao Fang
c12e5f2455 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 697a73dfdf -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: I07d197911c658be944a00ea9503cfbc518a5d00b
 2021-04-29 08:15:52 +00:00
Tsung-Mao Fang
656dcf8334 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: Ia31fdf9137868aa85df1ea723f94e6d0092c3f93
 2021-04-29 07:22:51 +00:00
Tsung-Mao Fang
697a73dfdf [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: Iff3503de805075b9645a9f3b9a046460b35ce5ef
 2021-04-29 07:22:15 +00:00
Wesley.CW Wang
86a6a0d32c Make app usage page active time support time period 
- Add time slot into active time text
 Screenshot: https://screenshot.googleplex.com/hzj5cJ3eDJD5iW7.png

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I0904e78ca9ab0a5b454e093388f667e978e8722f
 2021-04-29 15:08:30 +08:00
Tsung-Mao Fang
a66212e11d [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: I8cf58ae2e0a0632dc97b2cb049225959fd570828
 2021-04-29 07:06:42 +00:00
Tsung-Mao Fang
4c05b195d7 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: I08c75393a497f2d3784ea89376c5a0d0abf7517e
 2021-04-29 06:51:51 +00:00
Tsung-Mao Fang
4d7853f35c [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: I1433418c4c0ffbf0e0337f6a03c03c22d594d349
 2021-04-29 06:38:45 +00:00
Tsung-Mao Fang
26f3013c32 Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: Iac38c0d7f7517c8d4ecac036e73524d37c66fb6e
 2021-04-29 06:21:38 +00:00
PETER LIANG
fb789f0c06 Merge "Update the BC style for the vision settings in SuW." into sc-dev am: 9246f6f8b0 am: 5db9770aba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319864

Change-Id: I3ae92539819b77c3efbee2246f26b7ec9192d58e
 2021-04-29 03:42:19 +00:00
TreeHugger Robot
42c65e6b49 Merge "Settings: Turn Privacy hub on by default." into sc-dev am: 7bdbe80abe am: d481442b83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339809

Change-Id: Ieb6a8476d7afb27c8f3299a3cb6ef034a5b2f986
 2021-04-29 03:41:54 +00:00
TreeHugger Robot
9891597029 Merge "Fix several challenge paths" into sc-dev am: fcb325c562 am: 1533fd1e11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14342148

Change-Id: Iabc503b1abd3b3db6ab51747877552378f2cdaf1
 2021-04-29 03:41:36 +00:00
TreeHugger Robot
7063ea4ef1 Merge "Remove icons of Location Services and App location permissions" into sc-dev am: 3eb980d41b am: 3006e0473b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14341501

Change-Id: Icda24f75b8f45bf6aa1bd38633c07208fae98cb1
 2021-04-29 03:37:51 +00:00
PETER LIANG
5db9770aba Merge "Update the BC style for the vision settings in SuW." into sc-dev am: 9246f6f8b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319864

Change-Id: I431de866be724613d84548bf8ff314736dd09663
 2021-04-29 02:47:36 +00:00
TreeHugger Robot
d481442b83 Merge "Settings: Turn Privacy hub on by default." into sc-dev am: 7bdbe80abe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339809

Change-Id: Ieb86cf2c80fc9cd4834472f74ca3d66fad4b7dac
 2021-04-29 02:47:30 +00:00
TreeHugger Robot
1533fd1e11 Merge "Fix several challenge paths" into sc-dev am: fcb325c562 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14342148

Change-Id: I0c64891c95e3ad09dd8afb431a943a6d12dd6839
 2021-04-29 02:47:12 +00:00
TreeHugger Robot
3006e0473b Merge "Remove icons of Location Services and App location permissions" into sc-dev am: 3eb980d41b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14341501

Change-Id: Ic61d297a31265d0e36c2959eff512ffe326a7254
 2021-04-29 02:46:24 +00:00
PETER LIANG
9246f6f8b0 Merge "Update the BC style for the vision settings in SuW." into sc-dev 2021-04-29 02:44:36 +00:00
TreeHugger Robot
7bdbe80abe Merge "Settings: Turn Privacy hub on by default." into sc-dev 2021-04-29 02:07:09 +00:00
TreeHugger Robot
fcb325c562 Merge "Fix several challenge paths" into sc-dev 2021-04-28 23:48:32 +00:00
TreeHugger Robot
3eb980d41b Merge "Remove icons of Location Services and App location permissions" into sc-dev 2021-04-28 23:46:54 +00:00
Kevin Chyn
1f0cd17e3e Fix several challenge paths 
1) Combined settings page should finish() when losing foreground
   (but not if fingerprint or face settings are launched from it)
2) Challenge should be generated when entering FaceSettings or
   FingerprintSettings each time. This allows us to leave the existing
   revokeChallenge paths in FaceSettings and FingerprintSettings.

Fixes: 186257202
Test: Manual

Change-Id: I1b6452f787279001a71628f220c01fcb86b88f3d
 2021-04-28 13:01:28 -07:00