TreeHugger Robot
041b99ccd5
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-30 02:23:38 +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
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
16b0f660ae
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev
2021-04-29 17:19:34 +00:00
Amit Mahajan
6402ac45e6
Merge "Fix incorrect logging." into sc-dev
2021-04-29 16:54:06 +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
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
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
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
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
TreeHugger Robot
9d3442bd47
Merge "Make collapsing toolbar load font synchronously" into sc-dev
2021-04-28 09:29:24 +00:00
Hugh Chen
ddafb202bd
Fix usb tethering switch back to none after off/on the screen
...
This CL adds conditions to check whether usb is connected or not.
If usb is not connected or tethering is not started don't update the
state.
Bug: 157709648
Test: make RunSettingsRoboTests -j56
Change-Id: Ifbf5900923419d6abf35834b196aab12601076e4
2021-04-28 09:12:15 +00:00
TreeHugger Robot
e06f5a93b1
Merge "Bring the search icon back in developer page" into sc-dev
2021-04-28 08:36:58 +00:00
SongFerng Wang
03fbae7fc5
Merge "Ui show "No connection" when WiFi is turned on and no available network" into sc-dev
2021-04-28 07:18:01 +00:00
Tom Hsu
463805b142
Merge "[Provider model] Show no connection during out of service." into sc-dev
2021-04-28 06:32:33 +00:00
YUKAI HUNG
40114d8cf1
Merge "Update string for battery usage footer to include charging info" into sc-dev
2021-04-28 06:00:04 +00:00
SongFerngWang
8e0349a67b
Ui show "No connection" when WiFi is turned on and no available network
...
Follow this table to display the UI.
https://docs.google.com/spreadsheets/d/1w7R7Q3EXkep7iO4VcgioNp00DWas3Xve5i1rWexAkz8/edit#gid=954295315
Bug: 183593681
Test: atest ProviderModelSliceTest
atest ProviderModelSliceHelperTest
atest InternetConnectivityPanelTest
make RunSettingsRoboTests -j
Change-Id: I103f9b2fafe4fc543452a74b7ee7b2e537f879b5
2021-04-28 12:35:37 +08:00
YUKAI HUNG
70c872c160
Merge "Draw timestamp information into BatteryChartView manually (2/2)" into sc-dev
2021-04-28 04:08:55 +00:00
Mill Chen
4d6bbc8af9
Make collapsing toolbar load font synchronously
...
Since collapsing toolbar might load the font asynchronously, it caused
that some settings pages are seeing a flicker on its title. This change
is using TextAppearanceConfig.setShouldLoadFontSynchronously(true)
method to have title font load synchronously, which would remove the
flicker problem.
Fixes: 182232144
Test: visual verified
1) Enable developer options
2) Settings > System > Developer options
3) See if there's a flicker on title
Change-Id: I4e1db1a0fae9f69c7ff5baca7ada49c08f1bcbea
2021-04-28 11:45:52 +08:00
Kevin Chyn
77ddf11ae6
Merge changes from topic "new-fp-strings" into sc-dev
...
* changes:
Update fingerprint strings
Update FingerprintEnrollIntro text and icons
2021-04-28 03:31:31 +00:00
ykhung
a39dce70fc
Update string for battery usage footer to include charging info
...
https://docs.google.com/presentation/d/1IDmMZILzXFJb-IOt9zZc0m5g2fCamd9gBoacUsWhibg/edit?ts=6087fc2e&resourcekey=0-UhJZmzej-0opeJHr6yVKWQ#slide=id.gc788e97ad4_0_178
Bug: 177406865
Test: make SettingsRoboTests
Change-Id: I6abba8a2c22be57a1afb2e6fae3d2e222dbb3f96
2021-04-28 03:08:16 +00:00
Amit Mahajan
e22567d44e
Fix incorrect logging.
...
Test: none
Bug: 182326102
Change-Id: Ibe9b4dd26eb92327d32dc3447c5a613c3fefa46e
2021-04-27 17:43:13 -07:00
Kevin Chyn
290298d58d
Update fingerprint strings
...
Bug: 185804815
Test: manual
Change-Id: I5d1431646cd320e0f72e3c5f9f22cc2c9c2d0ef6
2021-04-27 14:37:34 -07:00
Kevin Chyn
28d635d9aa
Update FingerprintEnrollIntro text and icons
...
This change uses strings that have already been merged. Anything
requiring string changes will be in a follow-up CL
Bug: 185804815
Test: on-device
Change-Id: I4e3d3631bbb9f976badf9d4a1582456b3cb7fae7
2021-04-27 14:26:22 -07:00
TreeHugger Robot
e37695c89d
Merge "Revert "Remove "See all" button"" into sc-dev
2021-04-27 21:00:30 +00:00
Yu-Han Yang
4775b90eff
Remove icons of Location Services and App location permissions
...
Bug: 180533061
Test: on device
Change-Id: I85b88823f730494836677caa489b1e249913e5f4
2021-04-27 13:47:57 -07:00
Alex Johnston
f3be8a6cc8
Merge "Correct string ConfirmDeviceCredentialActivity" into sc-dev
2021-04-27 20:16:00 +00:00