bsears
30e9ba1e52
Revert "Fixes 'no ripple effect' issue for screen attention setting"
...
This reverts commit 20d1da2b62
.
Reason for revert: Based on bisection, this is the likely root cause of b/186904496
Bug: 186904496
Change-Id: I0eaa026b52610d7ef4543c32791531971e68f8e6
2021-05-03 17:59:11 +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
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
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
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
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
Yu-Han Yang
cf41f951ff
Revert "Remove "See all" button"
...
This reverts commit 1170a08d43
.
Reason for revert: design decision changed.
Change-Id: I954f8899f33a4c0e8945744e9bfcdbb48d9d705b
2021-04-27 18:36:18 +00:00
Jakub Pawlowski
54e74cae5f
Fix app name label spoofing
...
Fix idea was copied from
frameworks/base/core/java/android/accounts/ChooseAccountActivity.java
Bug: 183710549
Test: verified with POC app from bug that the fix is working
Change-Id: I40131965ed0d1e11cdf4b56daef39a95b80fdd7d
2021-04-27 17:06:59 +00:00
ykhung
10000eb254
Draw timestamp information into BatteryChartView manually (2/2)
...
screenshot: https://screenshot.googleplex.com/8zJcMJeMDovfhdD
Bug: 183921876
Test: make SettingsRoboTests
Change-Id: I276f70c3cf8ebd2316f987ace0d6537ed2cf8a45
2021-04-27 16:55:13 +00:00
Adam Bookatz
e035a81ddc
Merge "UserDetailsSettings uses Guest string, not Guest name" into sc-dev
2021-04-27 16:35:37 +00:00
Automerger Merge Worker
7fe923eec3
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c
-s ours am: 81aaadca0e
-s ours" into sc-dev
2021-04-27 16:21:56 +00:00
TreeHugger Robot
0171541f46
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c
-s ours am: 81aaadca0e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326566
Change-Id: I77e8734d4049649fe19c74f0eef0015ef8fbbab1
2021-04-27 16:21:54 +00:00
TreeHugger Robot
0509118fc5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e8413529ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326564
Change-Id: I513fde8dfce142f3119e08e272ab1f83f10e9b09
2021-04-27 16:21:52 +00:00
Automerger Merge Worker
8b3e1ed7ac
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c430db5ca3
-s ours" into sc-dev
2021-04-27 16:21:48 +00:00
TreeHugger Robot
413a305c27
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c430db5ca3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326565
Change-Id: If4187dd45690d6a2889496db8c83dcc5174ce03f
2021-04-27 16:21:42 +00:00
TreeHugger Robot
9761ce3e93
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4fd6557446
-s ours am: 8d58c02b06
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326567
Change-Id: I45e1115533ba4fec0cef8dc3fd42c873e05b631d
2021-04-27 16:21:39 +00:00
TreeHugger Robot
e8413529ce
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-27 16:16:39 +00:00
TreeHugger Robot
81aaadca0e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326566
Change-Id: I3ae76a9806d39de81adc2d7e127651f7f39dd735
2021-04-27 16:04:18 +00:00
TreeHugger Robot
8d58c02b06
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4fd6557446
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326567
Change-Id: I1c87402a98bc9642b5b555c66aee6f423b84e9ff
2021-04-27 16:04:08 +00:00
TreeHugger Robot
c430db5ca3
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-27 15:55:21 +00:00
TreeHugger Robot
697411518c
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-27 15:50:33 +00:00
TreeHugger Robot
4fd6557446
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-27 15:48:51 +00:00
TreeHugger Robot
f69ba03181
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-27 15:47:01 +00:00
TreeHugger Robot
a2a94ad379
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-27 15:42:58 +00:00
Alex Johnston
a942f3fdd1
Correct string ConfirmDeviceCredentialActivity
...
* If there is a managed profile but a separate
profile challenge is not enabled, use the device
title and subtitle in ConfirmDeviceCredentialActivity.
Manual testing
* Set device PIN
* Create a work profile using TestDPC
* adb shell am start --user 10 -a android.app.action.CONFIRM_DEVICE_CREDENTIAL
* Verify title says 'Enter your device...'
* Add a work profile PIN
* adb shell am start --user 10 -a android.app.action.CONFIRM_DEVICE_CREDENTIAL
* Verify title says 'Enter your work...'
* Do the same for pattern and password
Bug: 163108636
Test: manual testing
Change-Id: I8b61e7d2df5792cbdb2e12b19e5a5582ea2290b7
2021-04-27 16:35:42 +01:00
Tsung-Mao Fang
744dd99af4
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c
am: 6ac45a7ceb
am: f470b78ff2
am: 9d5a7aa322
am: 59463e3e04
-s ours
...
am skip reason: skip tag Change-Id I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: Ia128429dadf68a8276eff806ee0e0eabad088913
2021-04-27 13:28:36 +00:00
Tsung-Mao Fang
78de74aa57
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c
am: 6ac45a7ceb
am: f470b78ff2
am: 92d5e58003
-s ours
...
am skip reason: skip tag Change-Id I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 0bf3c98b2f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: I1bf9360219cdc326571ffc9604a42792dcc31aba
2021-04-27 13:12:34 +00:00
Tsung-Mao Fang
59463e3e04
Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c
am: 6ac45a7ceb
am: f470b78ff2
am: 9d5a7aa322
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: If58e759bcef83da086ded4366ac60647653d62cc
2021-04-27 13:11:26 +00:00
Tsung-Mao Fang
92d5e58003
Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c
am: 6ac45a7ceb
am: f470b78ff2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: If97943cb25cbbe5388a9b5d28faa50b4df156aad
2021-04-27 12:55:29 +00:00