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
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
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
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
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
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
8c0d342277
Merge "Bring the search icon back in developer page" into sc-dev am: e06f5a93b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14293744
Change-Id: I7f40d88705dd71f4a1f642f6c34d8a9971fd6015
2021-04-28 08:53:43 +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
94d5c2e861
Merge "Ui show "No connection" when WiFi is turned on and no available network" into sc-dev am: 03fbae7fc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14281929
Change-Id: I84092b24eeac15e7eca5a94986f32b16933a714b
2021-04-28 07:33:08 +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
1e5f3bc96a
Merge "[Provider model] Show no connection during out of service." into sc-dev am: 463805b142
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187782
Change-Id: I1ee103a89cfc479e4730bd049c11dbf470b2f6f9
2021-04-28 06:56:30 +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
f9b468d88b
Merge "Update string for battery usage footer to include charging info" into sc-dev am: 40114d8cf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327007
Change-Id: I30395e93d965548700c5b78b06922697f4ae9563
2021-04-28 06:12:17 +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
9e559f4b72
Merge "Draw timestamp information into BatteryChartView manually (2/2)" into sc-dev am: 70c872c160
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319868
Change-Id: If30e14af27736a403740053f9fa85754f1732f30
2021-04-28 04:27:33 +00:00
YUKAI HUNG
70c872c160
Merge "Draw timestamp information into BatteryChartView manually (2/2)" into sc-dev
2021-04-28 04:08:55 +00:00
Kevin Chyn
2d97d3c3d2
Merge changes from topic "new-fp-strings" into sc-dev am: 77ddf11ae6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330069
Change-Id: I6d317eea7ad59032581a9caa58cf37b03f6aff17
2021-04-28 03:56:42 +00:00
Kevin Chyn
b89cc9b108
Update FingerprintEnrollIntro text and icons am: 28d635d9aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330066
Change-Id: I1d8d313b780f978a5d486e491a14d887b8e85eb3
2021-04-28 03:56:40 +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
TreeHugger Robot
3de5bfc12b
Merge "Revert "Remove "See all" button"" into sc-dev am: e37695c89d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14324027
Change-Id: Ib66b8b9bd43cf6ae10510de37b01ace2a31a4d3c
2021-04-27 21:41:29 +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
923a731fae
Merge "Correct string ConfirmDeviceCredentialActivity" into sc-dev am: f3be8a6cc8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14296227
Change-Id: I81352745c1630c5da1eb9d3538916c878375b957
2021-04-27 20:35:34 +00: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
1eb44ba4f3
Fix app name label spoofing am: 54e74cae5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14076525
Change-Id: I638b94ba8409e27a6cdb5a4e900bd4887528782b
2021-04-27 17:33:08 +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
a82816e7b2
Merge "UserDetailsSettings uses Guest string, not Guest name" into sc-dev am: e035a81ddc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14282598
Change-Id: I5c7b2e03c097503fb7f4c938e8d295458882c3a8
2021-04-27 16:47:17 +00:00
Automerger Merge Worker
ddaa102eb7
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 am: 7fe923eec3
-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: Ifff741187ee18f01260fb1427660130bbc89628b
2021-04-27 16:47:14 +00:00
TreeHugger Robot
f3ffb500fd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e8413529ce
-s ours am: 0509118fc5
-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: I179e91036a4be5c3cd4b7f8dbdc6fdfbe95763ef
2021-04-27 16:47:09 +00:00
Automerger Merge Worker
85b117c2c4
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c430db5ca3
-s ours" into sc-dev am: 8b3e1ed7ac
-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: If18d1ee19740cb6c88083316b6d8cffa67f75db4
2021-04-27 16:47:05 +00:00
TreeHugger Robot
0d9b463dc8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4fd6557446
-s ours am: 8d58c02b06
-s ours am: 9761ce3e93
-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: I6dd7ff7cbb525018911497cb9e8c2dede2e2ae84
2021-04-27 16:46: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