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
0887761e6f
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: Ide1c356052f491378abef58d84805920674961e8
2021-05-06 06:13:32 +00:00
YUKAI HUNG
7452491629
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: I1cdb913df2372715a35845efef5b8112886a1e5e
2021-05-06 06:12:58 +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
1f00925c74
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: Id24b4e7f3a0852e1a85415e6232ed99b318ba3f3
2021-05-06 05:49:10 +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
1b23d619b8
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: I294102407ed1ee0dae97e4485b454a1b44c80f5e
2021-05-06 05:27:13 +00:00
TreeHugger Robot
cb07496c14
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: I2db1d3c880208cee5852c987c8edfdd6a5908a36
2021-05-06 05:26:58 +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
ab3528dc86
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: Iaf7e07ae15cffcef51b8621f6512e68f7eb5f409
2021-05-06 03:51:06 +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
a59fe14784
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: Ia521623543a767b5cd4bce0132e5d033b265a229
2021-05-06 02:33:01 +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
d2c87251c5
[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: Id026a6b6f05aa9745cb4b97e5716f74d67f0334e
2021-05-06 01:35:00 +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
3266345a56
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: Idbc1e23f571f26d7beddf5695e171fd57688d191
2021-05-06 01:28:23 +00:00
Weng Su
b4e67f049b
[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: I8975bd562f3faaf709697aa18ffbf4103d8a1c67
2021-05-06 01:27:48 +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
Weng Su
7a8de548ce
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-s ours am: 41b7d11496
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: Ia231ae0efc338828b1cdf84d1330234b10af0aaa
2021-05-06 00:42:38 +00:00
Weng Su
2e9640d5b0
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-s ours am: 41b7d11496
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: Ifcf837b36c99311ada4c7e1655dbd8a6b6ac6ad7
2021-05-06 00:41:08 +00:00
Weng Su
41b7d11496
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-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: I76f3b2ce80dd10bffb768862de34bc94b1f3d4b2
2021-05-06 00:16:30 +00:00
Weng Su
632eb0d54a
[DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: I45816ca240725b57db5a68ac1b960dab5b8f1b0b
2021-05-05 23:59:31 +00:00
Weng Su
88cafbaa24
[Provider Model] Fix settings crash issue
...
- The GlobalSettingsChangeListener needs to be closed after the life
cycle is destroyed
Bug: 185756174
Bug: 186404332
Bug: 186591527
Test: manual test
atest -c InternetUpdaterTest
Change-Id: I9fbad3b303055c6c7a61ccad8efe69cefef56c58
2021-05-06 05:53:41 +08:00
Yi Jiang
f54a2be819
Fixes NPE in Screen attention setting
...
Bug: 186904496
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.display
Change-Id: I9bd1e6824e19cf8ea281f7af482d13ef47f36256
2021-05-05 12:06:51 -07:00
TreeHugger Robot
7024c27f8a
Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev am: f9ebf6600f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436937
Change-Id: I4ea2c6799893bc29b2685ffaf7d4971cfc1f32b0
2021-05-05 18:13:08 +00:00
TreeHugger Robot
712a9f3c38
Merge "Add placeholder summary" into sc-dev am: 5dbc9e8124
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441563
Change-Id: I1f62173557d7fd4969378a7119ff62ca2da8b89e
2021-05-05 18:12:46 +00:00
TreeHugger Robot
f9ebf6600f
Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev
2021-05-05 18:06:07 +00:00
Edgar Wang
aa48592b40
Update Prevent Ringing summary when it turn off
...
Bug: 187145174
Test: manual & robotest
Change-Id: Ifc06a38ff65f084db2803c56b5a37224c5b9b810
2021-05-06 01:49:24 +08:00
TreeHugger Robot
5dbc9e8124
Merge "Add placeholder summary" into sc-dev
2021-05-05 17:47:18 +00:00
Mill Chen
2918626258
Update the theme for Notification history page
...
Fix: 187241188
Test: visual verified
1) Enable the light theme
2) Settings > Notifications > Notification history
3) See if the color of icon in the status bar is white
Change-Id: I2f198a10b71d0d0f7c92db0feab2154a1c8f25c6
2021-05-06 01:18:01 +08:00
ykhung
9db43b8f76
Add new constructor to create BatteryHistEntry from interpolation
...
https://matthew-brett.github.io/teaching/linear_interpolation.html
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I6dbdb3db8243e40bc54bde3aab7157fda2719de9
2021-05-06 00:42:14 +08:00
Yanting Yang
d1312e8e6e
Add summary back to the homepage
...
Also update some summaries with new strings.
Bug: 183586663
Test: robotests & atest & visual
Change-Id: I692be9b34e8867501aaa8c8e40428870b99644f8
2021-05-06 00:27:37 +08:00
Tsung-Mao Fang
2042dac123
Fix loading ring overlapping problem
...
By design, the loading ring is in the middle of the recycler view.
In the Android S, recyclerview isn't matched the screen's height.
So, if the recyclerview doesn't contains any item, the height could be
very low and then it causes to overlaps with drop down view.
The simple solution is to fix height of view of progress
bar, so it won't rely on the height of recycler view anymore.
Fix: 184643347
Test: Go to app notification page, and no overlapping problem.
Change-Id: I9f4fddba0254ac0cb0ba0b128a7dcc2de05d1fce
2021-05-05 23:43:46 +08:00
Mill Chen
129036cf75
Fix color filling on some Wifi pages
...
Since there's no edge-to-edge in the theme that Wifi page applied, it
caused the different colors filled in status bar and collapsing
toolbar area separately. It can be fixed by updating the theme to
Theme.SubSettings.
Fix: 187016196
Fix: 187021412
Test: visual verified
Change-Id: I686861c37acfb1eeddda1278cd70fa5bfd44cc1d
2021-05-05 23:41:16 +08:00
Mill Chen
ecd1495977
Fix searching condition for biometric settings
...
The preferences that are related to biometric settings should only be
searchable if the device supports the multiple biometric auth. However
we can see these preferences still can be searched even the device
doesn't support the feature, which is caused by that there's no
guardence. So the availiability of the preferences need to be updated to
prevent revealing unsupported preference from Settings search.
Fixes: 187167774
Test: manual test
1) Navigate to Settings search on a device without face auth
2) Search for face
3) See if there's something about face unlock
Change-Id: I6f120e8d9002a1e8f0be9361fdbea193776e4d7d
2021-05-05 23:35:53 +08:00
Edgar Wang
27eec61289
Add divider below ActionButtonPreference in BluetoothDetailFragment
...
Bug: 187121773
Test: visual
Change-Id: I230967ae807431d92dcb82c16b12891a49b3ee0e
2021-05-05 22:30:59 +08:00
TreeHugger Robot
d5d3c7c768
Merge "Apply dynamic color for Erase all data(factory reset screen" into sc-dev am: ea1d3228b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438399
Change-Id: Id89b8538c7d7cbb430b883963511a03b56f0c0db
2021-05-05 14:30:00 +00:00
TreeHugger Robot
ea1d3228b7
Merge "Apply dynamic color for Erase all data(factory reset screen" into sc-dev
2021-05-05 14:18:18 +00:00