PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,584 Commits 1 Branch 0 Tags
a346b685669bf2d40330d9ae38cfde7da122fa2e
Commit Graph

82584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Menghan Li
c1bb29bfd4 Merge "Fix Sound Amplifier does not have 'Open XXX' button" into sc-dev am: fa0ef8f2d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409965

Change-Id: I59026cab3e3700cd861d75f989700fe36b931c99
 2021-05-06 10:59:49 +00:00
Menghan Li
ebaeca294a Merge "Rename Tap assistance to Timing controls" into sc-dev am: 51fa8a290b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441407

Change-Id: I00df4bc27bc268334ce8c77282304a5b2988aa10
 2021-05-06 10:59:44 +00:00
Menghan Li
fa0ef8f2d9 Merge "Fix Sound Amplifier does not have 'Open XXX' button" into sc-dev 2021-05-06 10:48:19 +00:00
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
985f5bb786 [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: Icf5d9caa7e08fdff8136d649cc8b69a4d2ab3bd6
 2021-05-06 08:25:45 +00:00
TreeHugger Robot
1cc5ae6b94 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: I646327b872c5e618814dd4e00e9d5d3bcd840edc
 2021-05-06 08:25:24 +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
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
7757c26e55 [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: I232677034128f4d2cb50e6eaeb079fa6176f6851
 2021-05-06 07:29:00 +00:00
TreeHugger Robot
727b230ba7 [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: I9fd58fe196df6571a67f9e4a2710308f093d563d
 2021-05-06 07:28:48 +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
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
Yi Jiang
2f49b652e4 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: I2f494f2ab3d877875274a432c0c51ed19ef62a6e
 2021-05-06 07:06:54 +00:00
TreeHugger Robot
792188e38d 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: I16a575f9f6a75181e3ee4311d897404c1e7f16db
 2021-05-06 07:06:38 +00:00
TreeHugger Robot
932021a9a4 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: Iab5b45764761bf0dad925a5d33757c8d7555fe0f
 2021-05-06 07:06:12 +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
c5b79e9b96 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: Ifaa38c49279153dc0926dc8b16203cb712703daf
 2021-05-06 06:13:26 +00:00
YUKAI HUNG
c584f2f8a9 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: I1d198418518eeca86ac3336bd704efd6204306c0
 2021-05-06 06:13:14 +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
0c87f2f41f 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: I6ec33018341b86b84d14d42d522b5f4842884351
 2021-05-06 05:49:50 +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
eab02d8d91 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: Ib891ceb04450baae0bc6ff9dc442f4ed6b2419f5
 2021-05-06 05:27:38 +00:00
TreeHugger Robot
138c3e809e 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: Idf4d5cb4109ffdb6dfdec9994217484a846eb46e
 2021-05-06 05:27:31 +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
7f45dd0805 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: I599b73fe635f012ea89a43b6f670ddc006bbd34c
 2021-05-06 03:51:24 +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
a0d2e589c9 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: I99b5397e304a24dd16286736550b4f180b065325
 2021-05-06 02:33:41 +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
0a5df96d26 [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: I06c9684e36d38a10f7b2c11d7ecaecf57c3b728d
 2021-05-06 01:35:31 +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
f212a6c7e5 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: I9534f18310a682358b7b9d734868e56358d52e89
 2021-05-06 01:28:26 +00:00
Weng Su
caee45d3fe [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: I25f8425a9dd290118a44d39ea7b28fd09547a95f
 2021-05-06 01:27:28 +00:00