PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,165 Commits 1 Branch 0 Tags
161dbfb86d06b835bbde43d2d3aae28c14dcf1c7
Commit Graph

82165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
161dbfb86d [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: Idc87fafa55b0fe69be89b37368d68bb4f1e3abfb
 2021-04-30 03:34:37 +00:00
TreeHugger Robot
c03459cd4d 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: I2385546796a38f11d391f7c679eb1648ded7caa7
 2021-04-30 03:34:32 +00:00
TreeHugger Robot
385c458ed8 [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: Id5967781f0f82b8dad460aba7a6061c23d04c45b
 2021-04-30 03:34:27 +00:00
Bill Yi
f48ac408e2 [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: I857ea74d5785e86105deb654f1cf401c4454bbe3
 2021-04-30 03:33:36 +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
16124f111a [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: If7b4ffaf533c2822e087a1ddd1ecc0c37d4b4c05
 2021-04-30 02:57:54 +00:00
TreeHugger Robot
94f9715c66 [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: I9ada76b8bfe18da4bf11b620c95d27da074ea697
 2021-04-30 02:57:22 +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
ee6886faaa Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-30 02:51:54 +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
57757a5b6c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-30 02:29:50 +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
a276ae1b70 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: Iea2781c6497409ba5259bd607faa586540bd0282
 2021-04-29 23:43:42 +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
710f207d38 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9a9ffb024f7f4dbd69638d70ca293b597cd3a961
 2021-04-29 21:06:51 +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
bf1eb201cb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If05b57e9b5a4320c1d8ccaf9c9ae03fc511be744
 2021-04-29 21:01:31 +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
0e1b264b7f 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: I8b28d4b5623f54a6ddfaecc3c18eef8feccd6011
 2021-04-29 19:47:00 +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
9541aa2c3f 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: I9d14f7b1c2fba164a16a291a1a2b607cf5c47735
 2021-04-29 17:47:46 +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
669ce62100 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: Ie956d90ce4e2d1a807f3163da651632bf56cc670
 2021-04-29 17:14:31 +00:00
Amit Mahajan
6402ac45e6 Merge "Fix incorrect logging." into sc-dev 2021-04-29 16:54:06 +00:00
Matt Pietal
3edc574239 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: Id39c1381a606c4848201810b9fb9473b94bdd7de
 2021-04-29 12:18:26 +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
12ba1f30d6 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: Ic63d78725e265c451fe239feb4b703408adfbcb4
 2021-04-29 09:22:12 +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
6e9ac17702 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: I0def620b5dd093dc1fc2cf490e467fadf3208b64
 2021-04-29 09:15:18 +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
a3b812bb99 [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: I4a6e215b84de70dceb0e4986e4940186a6c2cccf
 2021-04-29 09:05:48 +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
Tsung-Mao Fang
62ad5f0020 [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: I01b81c327f3e9fb31b2a55c72e25099100aeb355
 2021-04-29 08:57:51 +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