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

81331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
c9b99fbf00 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56 -s ours am: b702fdea6d -s ours am: 226146afee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9f5187ea30e04493e66c0c31d9c5777d28c2f9a
 2021-04-30 03:35:45 +00:00
TreeHugger Robot
56a3e57991 Merge "Retain and restore showSystem state when rotated" into sc-dev am: 8f8666e3d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356126

Change-Id: If955050791d645bdc3d5b31ce2935d232918d3ea
 2021-04-30 03:35:38 +00:00
TreeHugger Robot
26fb969e07 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fb47f1e143 -s ours am: bf0ef5b73a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I765d5f3379961cdd85f6ec0fedd8710bd34a7c0a
 2021-04-30 03:35:28 +00:00
Bill Yi
7ed3955572 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6bb78b6d1b -s ours am: ff5e910f46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98f81abfb8cfe94c0b1d0b0fb21d53cc65943bcf
 2021-04-30 03:34:34 +00:00
Bill Yi
226146afee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56 -s ours am: b702fdea6d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6bb725127c897cead36281c2e7f483425a11de2f
 2021-04-30 03:24:24 +00:00
TreeHugger Robot
8f8666e3d0 Merge "Retain and restore showSystem state when rotated" into sc-dev 2021-04-30 03:19:41 +00:00
TreeHugger Robot
bf0ef5b73a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fb47f1e143 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4e60f2c23a41d97a346fa2dc13b233217f54cdc
 2021-04-30 03:07:42 +00:00
Bill Yi
ff5e910f46 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6bb78b6d1b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I437a411a2a7e2691520722955b963699c6710511
 2021-04-30 03:05:22 +00:00
TreeHugger Robot
016f441365 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6c7771a521 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I52d508ee6476430e6bc48ed732505a11073d96ab
 2021-04-30 02:59:48 +00:00
TreeHugger Robot
e30f685d83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 041b99ccd5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib05c6186fcc1752800cd65f83b311ec2ab84dbf2
 2021-04-30 02:58:37 +00:00
Bill Yi
b702fdea6d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9e3f7394d14440fc23b25b34547ebf492df66a7
 2021-04-30 02:56:10 +00:00
TreeHugger Robot
fb47f1e143 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-30 02:35:40 +00:00
TreeHugger Robot
6c7771a521 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-30 02:30:38 +00:00
TreeHugger Robot
041b99ccd5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-30 02:23:38 +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
Yu-Han Yang
c2ea62d1f8 Retain and restore showSystem state when rotated 
Bug: 182275573
Test: on device
Change-Id: I8a7e2d1ceb715cb6df470d7e3131b82d12ba6fa1
 2021-04-29 15:39:28 -07:00
Bill Yi
f8b4a0e963 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia4358bb5d5d07fb2401926298d083bc716834c5f
 2021-04-29 21:10:54 +00:00
Bill Yi
8c5796014f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0a606fcf13d894d280306449b80991be0f3234e5
 2021-04-29 21:03:06 +00:00
Bill Yi
090db24c56 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I10014f28a6678e3510e293bde00e2ccd909406f7
 2021-04-29 20:58:45 +00:00
Bill Yi
6bb78b6d1b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I273a20694088e7716213b38d7983319fc10ef3fb
 2021-04-29 20:52:24 +00:00
Bill Yi
9b1f0ab131 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I97875f1775c63f4a62f82808da766d37da190f2f
 2021-04-29 20:48:53 +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
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
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
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
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
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