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
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
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
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
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
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
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
407e6650bc
Merge "Fix a NPE when forget wifi network" into sc-dev
2021-05-05 10:39:29 +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
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
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
Hugh Chen
db53d1c6f8
Fix borken test on Bluetooth and connected package
...
Bug: 187239965
Test: make RunSettingsRoboTests -j56
Change-Id: Ic0d60a6cd46b1211efb2021f079c0b0a6534b383
2021-05-05 14:31:01 +08:00
Stanley Wang
dcd49621ae
Merge "Fix the "Video call" can be searched on unsupported device." into sc-dev am: 2248941d43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424445
Change-Id: Ifef9438e936f2e1e0eb1feb2799190b918c5abac
2021-05-05 05:36:17 +00:00
Stanley Wang
2248941d43
Merge "Fix the "Video call" can be searched on unsupported device." into sc-dev
2021-05-05 05:07:47 +00:00
Alex Salo
2ee354712e
Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev am: c26fabff2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14162986
Change-Id: I2af36a8053399de626a6a21d74e6beff5aac6731
2021-05-05 04:30:05 +00:00
Alex Salo
c26fabff2a
Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev
2021-05-05 04:12:38 +00:00
Stanley Wang
34c9c10617
Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev am: 9abe5df134
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160600
Change-Id: I6ccc986128b457d750f8c550a040428bc4e50508
2021-05-05 03:38:11 +00:00
Arc Wang
ddc9e22f72
Merge "Cleanup Storage Settings" into sc-dev am: 3576b10330
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408668
Change-Id: I23fae74a9cf6b2e0ceeefdf91707b0f5c250271e
2021-05-05 03:38:04 +00:00
Stanley Wang
81524c89cc
Fix the "Video call" can be searched on unsupported device.
...
The non-indexable does not work due to the NPE.
Fixes: 186594185
Test: robo test and see the search result.
Change-Id: Idc733b3521a774fa8b61a853aa078f50afc331cb
2021-05-05 11:32:10 +08:00
Stanley Wang
9abe5df134
Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev
2021-05-05 03:19:26 +00:00
Arc Wang
3576b10330
Merge "Cleanup Storage Settings" into sc-dev
2021-05-05 03:13:37 +00:00
lesl
26128e8722
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
Change-Id: Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb
2021-05-05 10:33:34 +08:00
Jeremy Goldman
aa3fee0833
Merge "Set summary if VPN is AlwaysOn Type" into sc-dev am: da602e196e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424438
Change-Id: I045b5709ef078367b7a646d7dec705acb5aedbcf
2021-05-05 01:32:57 +00:00
Jeremy Goldman
da602e196e
Merge "Set summary if VPN is AlwaysOn Type" into sc-dev
2021-05-05 01:06:01 +00:00
TreeHugger Robot
7c3659352e
Merge "Fix back navigation in biometric enrollment." into sc-dev am: 619321198c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14427973
Change-Id: I0100378ff8a1248754ecc9e99c4487fd412b8688
2021-05-04 23:53:04 +00:00
TreeHugger Robot
619321198c
Merge "Fix back navigation in biometric enrollment." into sc-dev
2021-05-04 23:23:39 +00:00
Joe Bolinger
43d978bd7b
Fix back navigation in biometric enrollment.
...
Using the back buttons can cause a crash in at least two cases. Skipping
face enrollment and then starting/stopping any enrollment can lead to
an invalid token and failed HAT request. Backing out of the activity and
restarting it can also lead to using a stale token that fails.
Fix: 179336333
Test: manual on device
Change-Id: I0c1133e4c3d9c97997043ddc9374aa3cfc4f1c97
2021-05-04 14:43:17 -07:00
Kevin Chyn
008734333e
Merge changes from topic "credential-removal-strings" into sc-dev am: 177d76986a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14365935
Change-Id: Ie4f759b138f4364a882c306a761b4520224df306
2021-05-04 20:33:25 +00:00
Kevin Chyn
24fe2f2a66
Update credential removal strings am: a435a5a288
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14357317
Change-Id: If28985c8f00a9baf61c7deee8d5ddf1c6ca7c141
2021-05-04 20:33:23 +00:00
Amit Mahajan
7654a6c861
Merge "Get rid of redundant mSubId." into sc-dev am: e2de71a6a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14354534
Change-Id: I0aaca9858251ea20f70a06e862c1d079561b1ecb
2021-05-04 20:33:07 +00:00
Kevin Chyn
177d76986a
Merge changes from topic "credential-removal-strings" into sc-dev
...
* changes:
Update combined settings summary
Update credential removal strings
2021-05-04 20:13:00 +00:00
Amit Mahajan
e2de71a6a4
Merge "Get rid of redundant mSubId." into sc-dev
2021-05-04 20:11:56 +00:00
Yi Jiang
ffa4f5fccb
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: f164cb1976
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14418428
Change-Id: Icbe84137bd1c64fa2c905416c775dd71cccb2bf2
2021-05-04 20:02:04 +00:00
Yi Jiang
f164cb1976
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev
2021-05-04 19:28:31 +00:00
Trevor Black
e39ee844a7
Merge "Update Android Settings for the latest Extra App Info design" into sc-dev am: b6f2f39d27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327037
Change-Id: I74afc2f66e3d91705b37d0be330283a1cffd32f2
2021-05-04 18:04:54 +00:00