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
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
dff47cf00a
Merge "Fix loading ring overlapping problem" into sc-dev
2021-05-06 06:51:24 +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
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
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
dc14b4ca0c
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: I2587cec3e2580c9ca9bbe859a621b75915b24aee
2021-05-05 18:13:12 +00:00
TreeHugger Robot
b3de93529f
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: Icc0d974bc567e5027e079ef77ce4a68459c786d4
2021-05-05 18:12:45 +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
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
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
TreeHugger Robot
0258cea266
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: Ib034e1b7ad7b9b926a97f63d752ee5886fae016f
2021-05-05 14:30:57 +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
Julia Reynolds
01ca4818b5
Add placeholder summary
...
So the scren doesn't shift when the summary is added
asynchronously
Test: manual
Fixes: 183474692
Change-Id: I658191de1e53140b823e06a5f7959dc77e5a7fcb
2021-05-05 10:13:46 -04:00
TreeHugger Robot
d75fbc426d
Merge "Fix the different color between status bar and action bar" into sc-dev am: 660341876d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439316
Change-Id: Ib86a429ae0e50b9b8f7b4ec3b4b890ce3ee30aad
2021-05-05 14:05:26 +00:00
Wesley.CW Wang
7d0988f26d
Update battery settings string
...
Bug: 168635076
Bug: 183689347
Test: make SettingsRoboTests
Change-Id: I1650c1c391ec3444f53360cd0f87f226b988ea04
2021-05-05 21:42:59 +08:00
TreeHugger Robot
660341876d
Merge "Fix the different color between status bar and action bar" into sc-dev
2021-05-05 13:30:13 +00:00
Betty Chang
5f002c7e40
Merge "Fix a NPE when forget wifi network" into sc-dev am: 407e6650bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424448
Change-Id: I2a516a722e302117ecadcb32fab6b946ca3db6ef
2021-05-05 11:11:30 +00:00