TreeHugger Robot
cf7e4a7583
[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: I90993df20707c7c68ff7f84d9e2a19192dfa4d0d
2021-04-30 02:56:41 +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
6e756261dc
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: Ibcb390f309b95eef7f0b3930fd186e3393cf6251
2021-04-29 23:44:27 +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
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
Almaz Mingaleev
fa78458d77
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: Ie15eaea8998e9b160e503c9660c27023af1a1504
2021-04-29 19:48:39 +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
86664ae7d7
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: Id5116fd479c6aedde3da6a4015ef6dc1e1d2659f
2021-04-29 17:47:18 +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
1c7eee0a01
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: I88218c986a1d2cb038a0e94c3e1aaa92bead757b
2021-04-29 17:14:15 +00:00
Amit Mahajan
6402ac45e6
Merge "Fix incorrect logging." into sc-dev
2021-04-29 16:54:06 +00:00
Matt Pietal
51c92821ff
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: I7e84309d1106ea15f6f00786cafd28e2c32972ee
2021-04-29 12:18:48 +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
f1ecd91d19
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: I15f652ad92d22451c2e13d956f078d1dd6601cf9
2021-04-29 09:22:56 +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
9958fc3753
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: I920f608f130dc142b7f36e95cfcfad2097cc7a36
2021-04-29 09:15:42 +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
5ae82a6f25
[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: I038a1e3cce1f13a24fb1c1c3ce58dc31d5e0af7e
2021-04-29 09:06:10 +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
de801793ac
[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: I9f5fa8d60ae4df93beed882002a5c9257b8388ad
2021-04-29 08:58:03 +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
688e5c27f3
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: I351d1a063a19b82cc8ad975e94a3dd88086bd9fa
2021-04-29 02:46:06 +00:00
TreeHugger Robot
4c22d2f6cc
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: I184406a8d61f70d3be8062b7ccf8207dbe66633f
2021-04-29 02:46:02 +00:00
TreeHugger Robot
5a9a4e1eb1
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: I81a3d6fc0a66abeb72249a2317041d6cee483e8b
2021-04-29 02:45:44 +00:00
TreeHugger Robot
8aca7b1839
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: Ife51f1a66ec88cf7e5ec80d481ffb0640e50a351
2021-04-29 02:45:15 +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
Matt Pietal
558ace6aca
SUW - Apply theme to FRP PIN pages
...
It is safe to always attempt to copy SUW intent extras, as they will
only be applied if they exist.
Fixes: 171950236
Fixes: 181212237
Fixes: 183711331
Test: SUW FRP verify, settings confirm existing PIN
Change-Id: I6d35683abdc864aea7b1ed0190d6776a75b3e116
2021-04-28 13:29:29 -04:00
tom hsu
a3f00c0d18
[ApnEditor] Create another string id for translation
...
- make translation of MVNO value be diversity.
Bug: 185209214
Test: Maunal test passed
- https://screenshot.googleplex.com/33vyFFBp8EnTpQ8
- atest passed
Change-Id: I9b26e23bf61f06a987682fe64d9ce079e2194818
2021-04-29 01:12:34 +08:00
TreeHugger Robot
01803e9d2a
Merge "Apply settings page transition" into sc-dev am: d3de9a1352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292669
Change-Id: I56f67c2044159570813d70055da1323d2a433834
2021-04-28 13:59:18 +00:00
Narayan Kamath
c80e4ce3a1
Settings: Turn Privacy hub on by default.
...
Bug: 176902658
Test: manual
Change-Id: I44027f29ce1a6b5a0c5eeba1e68cabb7476e7cc6
2021-04-28 13:48:16 +00:00
TreeHugger Robot
d3de9a1352
Merge "Apply settings page transition" into sc-dev
2021-04-28 13:41:04 +00:00
TreeHugger Robot
10585486bf
Merge "Tweak spacing for private DNS mode dialog" into sc-dev am: b07079dab8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319873
Change-Id: I25d285b010fb863fdc2850eaa1232ae76195a22c
2021-04-28 12:18:55 +00:00
TreeHugger Robot
b07079dab8
Merge "Tweak spacing for private DNS mode dialog" into sc-dev
2021-04-28 12:01:57 +00:00
jasonwshsu
b625e8a98d
Improve search by adding the settings keywords for supported framework feautres
...
* Improve search list: Magnification, Live Caption, Font size, Display size, Bold text, Dark theme, Extra dim, Color correction, Color inversion, Autoclick, Hearing aids, Real-time text
Bug: 184171842
Test: build pass
Change-Id: Ib8de8c736d6703e5028a8baa9fe2077aad8ee8cb
2021-04-28 17:59:57 +08:00
TreeHugger Robot
21742f0014
Merge "Make collapsing toolbar load font synchronously" into sc-dev am: 9d3442bd47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327008
Change-Id: Ic59fd871e3145afe730ddb447acb77bc3ae46672
2021-04-28 09:33:14 +00:00
Hugh Chen
69761dfade
Fix usb tethering switch back to none after off/on the screen am: ddafb202bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297855
Change-Id: I17ca69282384afb39e39a888eb88dd350318b50f
2021-04-28 09:33:07 +00:00