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
Jeremy Goldman
0a6a6269e3
Merge "Create unit test for the VpnInfoPreference" into sc-dev
2021-05-06 01:08:35 +00: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
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
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
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
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
menghanli
71bc131f88
Fix broken tests on Accessibility package
...
The VectorDrawableState would be new memory location to cause the
VectorDrawableState are different.
Bug: 187240532
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityButtonPreviewPreferenceControllerTest
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=FloatingMenuLayerDrawableTest
Change-Id: I33bc9076ee288beb044af29e9974f5f6328f29b8
2021-05-05 14:54:54 +08: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
Jeremy Goldman
c5cf69b1cf
Create unit test for the VpnInfoPreference
...
Currently the Settings VPN library doesn't including much testing
support, so this is intended as a start, in order to improve reliability
and stability of the area.
Test: atest -c VpnInfoPreferenceTest
Bug: 187245804
Change-Id: Id5acb699e0a68f479f3b0b6e6614c2e4e43b163b
2021-05-05 14:27:36 +08: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
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
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
Jan Tomljanovic
d11e4ef3a9
Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev am: b6cea338a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339810
Change-Id: I0f3b282d3d92d99b87cd230d9168bdf8d6b17cb0
2021-05-04 15:42:47 +00:00
Jan Tomljanovic
b6cea338a0
Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev
2021-05-04 15:35:43 +00:00
changbetty
e7d468f658
Fix a NPE when forget wifi network
...
To prevent the null activity. If activity is null, there is no need to
execute.
Bug: 184154325
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: I0dc32e7ea2a0d5a3f2a55ad8936578ed9fadd201
2021-05-04 22:26:51 +08:00
Arc Wang
e64f01ccfc
Cleanup Storage Settings
...
There is AOSP built in file browser for image/video/audio
file category, this change cleanup APP based category
for image/video/audio.
Bug: 183078080
Test: atest com.android.settings.deviceinfo
atest com.android.settings.deviceinfo.storage
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.storage
Change-Id: I925fc9296b8c2df5bd793668f66a12beb7744469
2021-05-04 22:21:53 +08:00
Stanley Wang
9b906cb5b6
Use MainSwitchPreference on Bubbles, Screen Saver and
...
One-Handed mode pages.
Fixes: 178679876
Fixes: 177968619
Test: robotest and see the UIs.
Change-Id: Ic62c7464a71e5410ece5d1db7578c522e1babedc
2021-05-04 19:31:29 +08:00
YUKAI HUNG
056221dcdf
Merge "Rename variables and refine the format style from ag/14346184" into sc-dev am: 37d6d0835c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419441
Change-Id: I217fe52a6c1df3f79d3bdd1a67c1330c3a0209c0
2021-05-04 06:14:29 +00:00
ykhung
973212adf7
Rename variables and refine the format style from ag/14346184
...
Bug: 14346184
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ie87f2dba2b87781ed5071adbc6f8a2aa45d1fd53
2021-05-04 11:59:07 +08:00
TreeHugger Robot
24f68e77b9
Merge "Fix unable to send file via OPP" into sc-dev am: 5ef4fa037e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327016
Change-Id: I4d45ab1ce416ce3fd899eac4e4ad1a663c4f3d10
2021-05-04 03:12:16 +00:00
TreeHugger Robot
5ef4fa037e
Merge "Fix unable to send file via OPP" into sc-dev
2021-05-04 03:00:23 +00:00
Yi Jiang
18c97b595f
Fixes 'no ripple effect' issue for screen attention setting
...
Preferences shouldn't be initialized at onAttach() because the settings
style hasn't been loaded yet. This change defers the preferences
initialization so that they comply with the settings style.
The change ag/14114425 is reverted due to b/186904496. This change
includes a fix for that issue.
Test: manually
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.display
Bug: 183909540
Bug: 186904496
Change-Id: I317ce251f4d11e62c6592ee587c2919da4d45db3
2021-05-03 18:02:59 -07:00
bsears
a0a3b2926d
Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev am: deb2acc9b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410366
Change-Id: Iea4057f38107df13c2d5b62719bd1845b7f14540
2021-05-03 22:22:52 +00:00
bsears
deb2acc9b3
Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev
2021-05-03 22:08:44 +00:00
Dmitri Plotnikov
aa2809177d
Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184
Change-Id: If4d7a7d6733cfb1886f561e7fcfb8f518ff58f4c
2021-05-03 20:47:41 +00:00
Dmitri Plotnikov
501eea7fa2
Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev
2021-05-03 20:40:25 +00:00
TreeHugger Robot
33baa05d95
Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 8d1fd73e89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186629
Change-Id: I4cf006558fda517dd7db111ee09e84cf17f7454d
2021-05-03 18:33:47 +00:00
TreeHugger Robot
8d1fd73e89
Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev
2021-05-03 18:11:03 +00:00
Dmitri Plotnikov
6417493b29
Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers
...
Bug: 186006876
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: I2e240aa15c87b4b9dcbe993b4b0b1111285ec3ff
2021-05-03 11:01:36 -07:00
bsears
30e9ba1e52
Revert "Fixes 'no ripple effect' issue for screen attention setting"
...
This reverts commit 20d1da2b62
.
Reason for revert: Based on bisection, this is the likely root cause of b/186904496
Bug: 186904496
Change-Id: I0eaa026b52610d7ef4543c32791531971e68f8e6
2021-05-03 17:59:11 +00:00
YUKAI HUNG
c25967c892
Merge "Add new field for data interpolation usage" into sc-dev am: f988790908
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409677
Change-Id: I768f28b5d87cc4ec0d790ef30b8787e45dd6b323
2021-05-03 12:42:57 +00:00
YUKAI HUNG
f988790908
Merge "Add new field for data interpolation usage" into sc-dev
2021-05-03 12:26:24 +00:00
Arc Wang
4cd89bb082
Storage Settings Apps category shows image/video/audio APPs
...
There is AOSP built in file browser for image/video/audio
file category, all APPs except games should be included in
Apps category.
- Shows image/video/audio APPs in APPs category.
- Count Image/Video/Audio APPs storage size to Apps storage size.
- Remove APP size & cache size for Images/Videos/Audios category.
Bug: 170918505
Test: atest StorageAsyncLoaderTest.java
Change-Id: I07e0a3a66a13f36b9e0cbde289d8ba90df4ae295
2021-05-03 20:17:58 +08:00
Ryan Lin
5bf2c6fa3c
Merge "Move Magnification Mode Settings to the main page" into sc-dev am: 194015b774
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327003
Change-Id: I0f35adb3c5c6479e7237f8f32c828af0ff96485a
2021-05-03 11:34:27 +00:00
Ryan Lin
194015b774
Merge "Move Magnification Mode Settings to the main page" into sc-dev
2021-05-03 11:28:02 +00:00
Menghan Li
442353df53
Merge "[Material Next] Update accessibility tool footer style" into sc-dev am: da60d4e842
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260604
Change-Id: I636d0f179d4e7bdf511ea0b8acb5e57511f8565f
2021-05-03 11:26:28 +00:00
Menghan Li
da60d4e842
Merge "[Material Next] Update accessibility tool footer style" into sc-dev
2021-05-03 11:13:28 +00:00
ykhung
0c7e50cb43
Add new field for data interpolation usage
...
reference the decription in cl/371645876
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I944399dc205cad9b96fe22e82e4c651b4ccc4e37
2021-05-03 18:31:27 +08:00
Menghan Li
b76dac1877
Merge "Hide the accessibility location preference when gesture navigation mode enabled." into sc-dev am: c7ddea6aa8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408665
Change-Id: I15c2b4be9550fbd4dd6f692d0fbe64c7ee8acdd3
2021-05-03 10:23:06 +00:00
Menghan Li
c7ddea6aa8
Merge "Hide the accessibility location preference when gesture navigation mode enabled." into sc-dev
2021-05-03 10:21:58 +00:00