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
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
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
TreeHugger Robot
a5d73fdde8
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: I2c0b8e0da20ecee7ae980b7a924f14d9044083ee
2021-05-05 18:14:42 +00:00
TreeHugger Robot
644b7a7c11
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: If2b8f0ff72a87ec43e10ec7a69afe59b76db3536
2021-05-05 18:14:25 +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
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
64d97239b6
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: I790924e31309ea7a9acecc73edc8e985c6a533b8
2021-05-05 14:32:05 +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
69f08ccadf
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: I93ee3aa78a4ed230c577effda75d491cc09546e0
2021-05-05 14:07:18 +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
cacc766087
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: Ia1cfe3fb52da7247b0daa3f67a2053f97cffb382
2021-05-05 11:12:16 +00:00
Betty Chang
8103e62f57
Merge "Add scrollView with config layout and button layout" into sc-dev am: 1637f3cd26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438397
Change-Id: I3cefc5c4cf7090c46cd30a68a014eb87a0513b17
2021-05-05 11:11:44 +00:00
Betty Chang
407e6650bc
Merge "Fix a NPE when forget wifi network" into sc-dev
2021-05-05 10:39:29 +00:00
Betty Chang
1637f3cd26
Merge "Add scrollView with config layout and button layout" into sc-dev
2021-05-05 10:39:13 +00:00
Tsung-Mao Fang
d3cd751f02
Apply dynamic color for Erase all data(factory reset screen
...
Enable the dynamic color flag, and remove some unused theme in layout.
Test: Rebuilt apk and see the screen
Fix: 185557130
Change-Id: I7ed73c808be4942e5ffd461982e73a4ff7f7f2db
2021-05-05 18:14:48 +08:00
Menghan Li
058ea1317c
Merge "Fix broken tests on Accessibility package" into sc-dev am: ad3dd1abbc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436939
Change-Id: I6d440e1e70d1583170ff4a0dfea5ea1859bbe998
2021-05-05 08:22:50 +00:00
TreeHugger Robot
13b13b3469
Merge "Fix borken test on Bluetooth and connected package" into sc-dev am: 5fe34bf7b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436938
Change-Id: I3ca6e943ff35f05ee2e6bc3f827426e7c91998a1
2021-05-05 08:22:45 +00:00
Yanting Yang
9cf34b18b5
Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" into sc-dev am: cd60664cc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410005
Change-Id: I2d5b9406135fe7542db579952960dc6d5c9959be
2021-05-05 08:22:40 +00:00
Sunny Shao
4c1219189c
Fix the different color between status bar and action bar
...
- use the Theme.SubSettings
Bug: 186608887
Test: manual review
Change-Id: I15392e7555472622a4eee3bad11ae8d69d03b438
2021-05-05 16:18:04 +08:00
Menghan Li
ad3dd1abbc
Merge "Fix broken tests on Accessibility package" into sc-dev
2021-05-05 08:14:24 +00:00