YUKAI HUNG
dd98b47255
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: I2b6c5ee5c3ef4bdb50091f4d31ed84e0777afafc
2021-05-06 06:12:38 +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
7ed90fe7db
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: I21825cc582faf3320115c16579ee77de38ea018e
2021-05-06 05:50:25 +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
c982d4581e
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: I4dbf1b5603e80a7f383da2f6bf2a4a5f1ddb04b2
2021-05-06 05:27:31 +00:00
TreeHugger Robot
a8b3277b18
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: I4e147e373c327911bb9a6d9b945855c4f4b454f2
2021-05-06 05:27:23 +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
67b79fe9f5
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: Id679cd941f052b587f3efb26c1e11787ee58d050
2021-05-06 03:52:02 +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
74ae8103aa
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: I960b95f216bbb3d8a5f1c94d128a8912be4a184d
2021-05-06 02:33:03 +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
c3546f25ac
[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: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: I184301b146a5669819e60d2b6733ce55f7f0e168
2021-05-06 01:35:03 +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
ae056efa5a
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: Ideedc7704c9e7497c3aaf641fa6450247becfd22
2021-05-06 01:28:30 +00:00
Weng Su
696dfe87b1
[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
-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: I6779497f56bda2d76615549d4a75a0d9fb026881
2021-05-06 01:28:06 +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
eee6a74723
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: Id3888ea162250350f0f970c0463376a8fea3d1dc
2021-05-05 18:13:02 +00:00
TreeHugger Robot
05975b3b48
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: I17205beed76ea647d27843d2b0761cd98c530127
2021-05-05 18:12:37 +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
61f5f2d94c
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: I924cf471ee28d9ff7930a9458292109bffc30566
2021-05-05 14:30:53 +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
db419cab2a
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: Ida3b64173f631dc27e58c59c5cb6c8d24fe3b303
2021-05-05 14:05:19 +00: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
475a143729
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: Ie66bc1331908f9b5f5c2f739468f6a0f6a8c19c9
2021-05-05 11:10:56 +00:00
Betty Chang
de3cffda3d
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: Ib5fcf6d55687946210db17bb25f192408ccaba8a
2021-05-05 11:10:33 +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
22387787b0
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: Ib3fd76a8da8df96959d5192bce952c43080c740d
2021-05-05 08:21:46 +00:00
TreeHugger Robot
fa20df2cf4
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: Ie25837addbb5848914c3292d53b087e8b56a0cc8
2021-05-05 08:21:41 +00:00
Yanting Yang
a831fb43ba
[automerger skipped] Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" into sc-dev am: cd60664cc3
-s ours
...
am skip reason: Merged-In Ia22ebac4baec60f72b8516e9e79998cd788266ab with SHA-1 899eb7282d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410005
Change-Id: Ic60b59a28abfcc8e851147d9fbebee4055182296
2021-05-05 08:19:58 +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
TreeHugger Robot
5fe34bf7b5
Merge "Fix borken test on Bluetooth and connected package" into sc-dev
2021-05-05 07:36:35 +00:00
Yanting Yang
cd60664cc3
Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" into sc-dev
2021-05-05 07:32:45 +00:00
Jeremy Goldman
8e712c1501
TopLevelStoragePreferenceControllerTest converted to JUnit
...
Helper function composed to return thread future, to guarantee
concurrent function finishes before test condition is checked.
Additionally a @VisibleForTesting helper function is used rather than
robolectric reflection helpers to set a class variable.
Fixes: 187249674
Test: atest -c TopLevelStoragePreferenceControllerTest
Change-Id: Ia22ebac4baec60f72b8516e9e79998cd788266ab
Merged-In: Ia22ebac4baec60f72b8516e9e79998cd788266ab
(cherry picked from commit 899eb7282d
)
2021-05-05 07:31:35 +00:00