Menghan Li
51fa8a290b
Merge "Rename Tap assistance to Timing controls" into sc-dev
2021-05-06 10:43:54 +00:00
Jason Chiu
f43f2f80a7
Apply the new search bar background color
...
Fixes: 182092326
Test: visual, robotest
Change-Id: I95bd73323e8407716261367461f008bafa35e78b
2021-05-06 17:35:40 +08:00
Mill Chen
872db9c41a
Add require scrolling button for FingerprintEnrolling intro
...
The consent in the fingerprint introduction has been updated. Users are
required to read through the content. Adding a scrolling button is to
prevent directly going to next page from this page. It also makes sure
the content has to be scrolled down to the bottom of page.
Fix: 184591438
Test: visual verified
1) Prepare a device with fingerprint sensor
2) Settings > Security > Fingerprint unlock
3) Entering the enrollment flow and see if the introduction has a button
named "More" on the right-bottom side.
Change-Id: I1916293807ca9fb04f5d576cf4f6aaccbbe1ff00
2021-05-06 17:29:38 +08:00
menghanli
924506e131
Fix Sound Amplifier does not have 'Open XXX' button
...
SettingsMainSwitchPreference does not allow hide switch bar. For support
this launch preference, we hide the SettingsMainSwitchPreference and add
new preference into the list.
Bug: 184711985
Test: Manual testing
Change-Id: I293800e83aafb387e0bb0a4988af774b56f508e6
2021-05-06 17:01:39 +08:00
Les Lee
cf4980bcc4
[automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: 7469890c87
am: f38761e027
am: eb9ec7f664
-s ours am: 956fdad9c6
-s ours
...
am skip reason: Merged-In Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb with SHA-1 26128e8722
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759
Change-Id: I4c1479e199cdcf1f1bc5db6a5248a868fec1fdee
2021-05-06 08:27:42 +00:00
TreeHugger Robot
6d44c61935
Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev am: e6b78a5ada
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319866
Change-Id: Ie3838f6a81f4274886986d2f33070a7e91f94207
2021-05-06 08:27:30 +00:00
menghanli
dd452cdf08
Rename Tap assistance to Timing controls
...
The "Tap assistance" section in a11y settings is specifically about the duration or delay of time-based controls. Rename the title to align to a wording that better calls that out.
Bug: 186773417
Test: Manual testing
Change-Id: I1116f42468ea2d2d9210f6e34041c02831879dc9
2021-05-06 08:20:38 +00:00
Les Lee
956fdad9c6
[automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: 7469890c87
am: f38761e027
am: eb9ec7f664
-s ours
...
am skip reason: Merged-In Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb with SHA-1 26128e8722
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759
Change-Id: I46bc1bafa7153a6fdfeec1bdf2372f84ff3b35c7
2021-05-06 08:10:35 +00:00
TreeHugger Robot
e6b78a5ada
Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev
2021-05-06 07:58:25 +00:00
TreeHugger Robot
fd730ef2de
[automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b
-s ours am: fdcf96ee99
-s ours am: 2c8ed65745
-s ours am: 461b72cdc7
-s ours
...
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 649bed1524
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352145
Change-Id: I563dfd56f61ff24b1e805a41b5f1c620a091697e
2021-05-06 07:31:27 +00:00
Les Lee
eb9ec7f664
Merge "wifi: Use new API for wifi data usage function" am: 7469890c87
am: f38761e027
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759
Change-Id: I40404277f44a14d60654911e168a482794355971
2021-05-06 07:30:41 +00:00
TreeHugger Robot
4ec5a7dbbb
[automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b
-s ours am: fd32dc93c9
-s ours am: 2c30777afa
-s ours
...
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352145
Change-Id: I3f867870e7206a38b91d17bc9b27776fd1602a92
2021-05-06 07:30:35 +00:00
TreeHugger Robot
461b72cdc7
[automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b
-s ours am: fdcf96ee99
-s ours am: 2c8ed65745
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352145
Change-Id: If9595e9becec89031b14a641432585a5180c9e2e
2021-05-06 07:22:51 +00:00
TreeHugger Robot
2c30777afa
[automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b
-s ours am: fd32dc93c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352145
Change-Id: If1bb853639cb83accad5abb75d81eb66aa24a2b0
2021-05-06 07:14:24 +00:00
Les Lee
f38761e027
Merge "wifi: Use new API for wifi data usage function" am: 7469890c87
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759
Change-Id: Id4c98842b11cb4102059fdbbe76d5c4b527302fe
2021-05-06 07:14:01 +00:00
Yi Jiang
9760064c72
Merge "Fixes NPE in Screen attention setting" into sc-dev am: d0af03e11c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443109
Change-Id: I13a74b84567195bdeca5c3be7bc4dfda5619ecec
2021-05-06 07:08:42 +00:00
TreeHugger Robot
5fa9ab1487
Merge "Fix color filling on some Wifi pages" into sc-dev am: b720318fd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439324
Change-Id: I4e5a4e0f55d9eaefee6cc524e8ec0e580209cd5b
2021-05-06 07:08:36 +00:00
TreeHugger Robot
6cb46f5164
Merge "Fix loading ring overlapping problem" into sc-dev am: dff47cf00a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439454
Change-Id: I24baef74164db1aad5c7fbb5c48916ed253b2b1e
2021-05-06 07:07:53 +00:00
TreeHugger Robot
2c8ed65745
[automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b
-s ours am: fdcf96ee99
-s ours
...
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352145
Change-Id: I1f266c1eaf5463e5970008dc027ded775be88a97
2021-05-06 07:06:57 +00:00
Les Lee
7469890c87
Merge "wifi: Use new API for wifi data usage function"
2021-05-06 06:57:03 +00:00
Yi Jiang
d0af03e11c
Merge "Fixes NPE in Screen attention setting" into sc-dev
2021-05-06 06:55:33 +00:00
TreeHugger Robot
b720318fd3
Merge "Fix color filling on some Wifi pages" into sc-dev
2021-05-06 06:54:14 +00:00
TreeHugger Robot
fd32dc93c9
[automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b
-s ours
...
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352145
Change-Id: Ia72b0e0d3827762aed6b92b100d5979df3f130f0
2021-05-06 06:53:25 +00:00
TreeHugger Robot
fdcf96ee99
[automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b
-s ours
...
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352145
Change-Id: Ia495305891c49e3ffee19d7bee3f0107f6085ad3
2021-05-06 06:52:02 +00:00
TreeHugger Robot
dff47cf00a
Merge "Fix loading ring overlapping problem" into sc-dev
2021-05-06 06:51:24 +00:00
Mill Chen
efbcc69cc4
Fix inconsist color filling on collapsing toolbar
...
Some pages are updating the background color for action bar after action
bar is created, which will break the animation of collapsing toolbar. It
also causes the different color filled in the status bar and collapsing
toolbar area separately. Removing the styleActionbar method from
EntityHeaderController can fix this issue.
Fix: 187019164
Test: robotests && visual verified
1) Settings -> Apps -> See all apps -> pick up either app -> Mobile data
& Wi-Fi
2) Scrolling the content and see if the toolbar has the different color
between status bar and toolbar
Change-Id: Ic0842b9e6c48662872694534a3696c4b8900481f
2021-05-06 14:46:30 +08:00
TreeHugger Robot
21ab21168b
Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev
2021-05-06 06:30:13 +00:00
TreeHugger Robot
4b3f704b88
Merge "Update battery settings string" into sc-dev am: 1ae9a706ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439450
Change-Id: I493692cab4cd71f50a5c882627763bea9aa93cf5
2021-05-06 05:59:32 +00:00
YUKAI HUNG
db779776cb
Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev am: b3267fb2ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439969
Change-Id: I9c352b081883ceee9a009c14f1e123fc9ec586d9
2021-05-06 05:59:16 +00:00
TreeHugger Robot
1ae9a706ff
Merge "Update battery settings string" into sc-dev
2021-05-06 05:55:49 +00:00
YUKAI HUNG
b3267fb2ea
Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev
2021-05-06 05:54:00 +00:00
TreeHugger Robot
55be0e9053
Merge "Fix searching condition for biometric settings" into sc-dev am: a75ba398fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439453
Change-Id: I856463521ea32b2b6bf64b2cb6d11802ec45fd84
2021-05-06 05:52:01 +00:00
TreeHugger Robot
a75ba398fe
Merge "Fix searching condition for biometric settings" into sc-dev
2021-05-06 05:37:08 +00:00
Jason Hsu
7649fa90f7
Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev am: 8caef2218c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408669
Change-Id: Ia51c9a07e0aca890c746906abf35ef8a5c5d821c
2021-05-06 05:29:24 +00:00
TreeHugger Robot
17877ef23e
Merge "Update Prevent Ringing summary when it turn off" into sc-dev am: 3aca460dfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442220
Change-Id: I479cc73697ab81973f04f8ba7ead8e26cb439688
2021-05-06 05:29:02 +00:00
Jason Hsu
8caef2218c
Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev
2021-05-06 05:18:50 +00:00
TreeHugger Robot
3aca460dfc
Merge "Update Prevent Ringing summary when it turn off" into sc-dev
2021-05-06 05:07:25 +00:00
Les Lee
a9ca9bec05
Merge "wifi: Use new API for wifi data usage function" into sc-dev am: 0dc1ee01f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419446
Change-Id: Ide9fa05ddab430487c903a49f14e37fbdef49e24
2021-05-06 03:53:29 +00:00
ykhung
953b7e3bf5
Add abnormal interpolation info to log unexpected conditions
...
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I11156c85b6b955dd505b41a9a41be0756638f1dd
2021-05-06 11:48:20 +08:00
Les Lee
0dc1ee01f8
Merge "wifi: Use new API for wifi data usage function" into sc-dev
2021-05-06 03:17:20 +00:00
TreeHugger Robot
e6e27e32bb
Merge "[Provider Model] Fix settings crash issue" into sc-dev am: f396c0af28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439968
Change-Id: I2a890de31d8986b9781a3eb085f8fd295ef72b4a
2021-05-06 02:21:06 +00:00
TreeHugger Robot
f396c0af28
Merge "[Provider Model] Fix settings crash issue" into sc-dev
2021-05-06 01:52:53 +00:00
lesl
fd41cce94b
wifi: Use new API for wifi data usage function
...
For wifi, a old API: buildTemplateWifiWildcard will includes the merged
wifi which is included to mobile usage. It should not double count
again. Call new API: buildTemplateWifi with
NetworkId: NetworkTemplate.WIFI_NETWORKID_ALL
and null subscriberId to get non-merged wifi usage.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppDataUsageTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppDataUsagePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageInfoControllerTest
Test: Manual Test, wifi data usage count correctly.
Bug: 176396812
Merged-In: Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb
Change-Id: Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb
2021-05-06 09:37:09 +08:00
Weng Su
b43f98b65c
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-s ours am: 41b7d11496
am: 2e9640d5b0
am: e304f37927
-s ours am: 2f3389ff0c
-s ours
...
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: I2257f4e5c1aba94edb3245ba85d71c520739b209
2021-05-06 01:29:53 +00:00
Jeremy Goldman
8c07c41e73
Merge "Create unit test for the VpnInfoPreference" into sc-dev am: 0a6a6269e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436936
Change-Id: Idc1107134c06c395f73a7b4ac9f53f18291d1027
2021-05-06 01:29:46 +00:00
Weng Su
a2b6fa6d46
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-s ours am: 41b7d11496
am: 7a8de548ce
-s ours am: 6e761235fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: I90270144eb2d7dab6527eb024f5bce1ec251c789
2021-05-06 01:29:20 +00:00
Weng Su
2f3389ff0c
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-s ours am: 41b7d11496
am: 2e9640d5b0
am: e304f37927
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: I36aa2286aec58e930f4f868d3c092b7629c402d6
2021-05-06 01:28:54 +00:00
Jeremy Goldman
0a6a6269e3
Merge "Create unit test for the VpnInfoPreference" into sc-dev
2021-05-06 01:08:35 +00:00
Weng Su
6e761235fd
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-s ours am: 41b7d11496
am: 7a8de548ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: I777137193db9eb406825545a9d591145d1b8694d
2021-05-06 00:57:51 +00:00
Weng Su
e304f37927
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-s ours am: 41b7d11496
am: 2e9640d5b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: Ibaef95b9f82be90e11e76af1838b4561087ac062
2021-05-06 00:57:15 +00:00