TreeHugger Robot
fa0c8a8ce8
[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: I8b2fc06397bc4cce9775c0d01204ce24595df489
2021-04-30 02:57:27 +00:00
TreeHugger Robot
dad62285d3
[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: I4f390fa58d1ab5ba57a34807f78927d687283b43
2021-04-30 02:56:59 +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
3eabde60b9
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: Iede0b4102d0651e654a616e1b820546ea4bd28e2
2021-04-29 23:43:55 +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
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
Almaz Mingaleev
74d2521f17
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: I4349a87c81688c481d4859698fdc5bd77b803850
2021-04-29 19:49:18 +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
d6e7c97468
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: Ie547e49d2d765ca6af615b4ee7200f4ca0049566
2021-04-29 17:47:42 +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
a0726c49f9
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: I4c7de39fbde8342019be357b5bf72b8d6d527f27
2021-04-29 17:14:00 +00:00
Amit Mahajan
6402ac45e6
Merge "Fix incorrect logging." into sc-dev
2021-04-29 16:54:06 +00:00
Matt Pietal
fb9f7f8684
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: Ib139c4d91de6cdffbbf296371363b4e3a79d0d45
2021-04-29 12:18:32 +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
c86c00f6b5
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: I6c0bed4fbb2a4b1d541d27c9a91c0fe87f93e84b
2021-04-29 09:21:40 +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
7e29471cd4
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: I1ee633b52b3cc8e5959b131d59249467f9f6a0b6
2021-04-29 09:14:38 +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
a68dc4738b
[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: Ic2e799809699d4689838a0c5c9b447139e8e4a2a
2021-04-29 09:05:47 +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
72072cff42
[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: I3d488493d237e57655c0b39d4de757e9090bda2f
2021-04-29 08:57:35 +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
6f438ebd9b
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: I570ad6afb174cb6364d1e647c5d1661efecc5282
2021-04-29 02:50:06 +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
1b08a11dfe
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: Ic18c843410f9c8e8420c98f4c0257cc2cb688d08
2021-04-29 02:40:27 +00:00
TreeHugger Robot
1a10e00c54
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: If71ec548482b22f50a56c2883e43e84856d92c8a
2021-04-29 02:38:06 +00:00
TreeHugger Robot
e1e738b86f
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: I5406fbe9101d4c400e8c606a506bef1648e421fe
2021-04-29 02:32:07 +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
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
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
Yi-Ling Chuang
58813f7b6c
Apply settings page transition
...
This change applies Shared X-Axis transition across settings pages. For
injected settings, the injected apps have to also apply the same
transition to take effect.
Fixes: 177479937
Test: robotests and navigate through settings pages
Change-Id: I6241860766f5969428faf9a5b3730a7614fdcd92
2021-04-28 17:29:49 +08:00