changbetty
7c2090b870
Add scrollView with config layout and button layout
...
Screenshot: https://photos.app.goo.gl/xmySTmdzbQeXksJC9
Bug: 186883458
Test: manaul test
Change-Id: I9c6855e95b032fbd71dce8399678521879363629
2021-05-05 15:26:18 +08: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
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
Wesley Wang
8cc536be70
Merge "Update battery help message layout" into sc-dev am: 0df7148f1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424446
Change-Id: Id171fcbe9b5d341a9b7c69346444fd352152a6b4
2021-05-04 18:06:06 +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
Wesley Wang
0df7148f1e
Merge "Update battery help message layout" into sc-dev
2021-05-04 17:54:11 +00:00
Trevor Black
b6f2f39d27
Merge "Update Android Settings for the latest Extra App Info design" into sc-dev
2021-05-04 17:38:26 +00:00
TreeHugger Robot
66c1e79449
Merge "Add null check for app labels" into sc-dev am: cc28a0826e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14426523
Change-Id: I6b96bf99db14e71e10e2ba2ca9e50806c026b1d7
2021-05-04 17:20:14 +00:00
TreeHugger Robot
cc28a0826e
Merge "Add null check for app labels" into sc-dev
2021-05-04 17:03:37 +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
Sally Yuen
378bfef524
Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev am: 478b218230
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414318
Change-Id: I5ba0586696b6305fdd5c1e2e6631d541c2b49feb
2021-05-04 15:41:57 +00:00
Julia Reynolds
bdcb525982
Add null check for app labels
...
Test: manual
Fixes: 187173056
Change-Id: I1affd901bc644597e4af7fc65c81f919c8589ed5
2021-05-04 11:40:09 -04: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
Sally Yuen
478b218230
Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev
2021-05-04 15:26:12 +00:00
TreeHugger Robot
7b36dc3e05
Merge "Update app usage page footer string" into sc-dev am: 16f8b4c943
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424447
Change-Id: Ic1b0fb191f3ef664d70aa156605b0455b2fbbb42
2021-05-04 14:40:36 +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
TreeHugger Robot
16f8b4c943
Merge "Update app usage page footer string" into sc-dev
2021-05-04 14:21:52 +00:00
Betty Chang
58b224a0f3
Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev am: 35e244754c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419452
Change-Id: I119d5b2ac1a4f7d6e182b8e01efe6dabeeac3ec1
2021-05-04 14:16:38 +00:00
TreeHugger Robot
e3907f337e
Merge "Remove the Summary of Backup in System Settings" into sc-dev am: 31a697eb79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410004
Change-Id: I24a555af9c03ee6bf6140d7228f51327f58194de
2021-05-04 14:16:24 +00:00
Betty Chang
35e244754c
Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev
2021-05-04 14:04:56 +00:00
TreeHugger Robot
31a697eb79
Merge "Remove the Summary of Backup in System Settings" into sc-dev
2021-05-04 14:00:49 +00:00
Wesley.CW Wang
531e6b23a2
Update app usage page footer string
...
- Use lower case string
Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Id4111256bdab5f74e31fed6d015b96fe687a4c7b
2021-05-04 21:13:25 +08:00
Wesley.CW Wang
3f98b5fb78
Update battery help message layout
...
- Screenshot: https://screenshot.googleplex.com/6mdCCHYZBMNMdMG.png
Bug: 179237551
Test: make SettingsRoboTests
Change-Id: Ie9bf2798ad733744c30278e98a75dd6c34c1a407
2021-05-04 20:57:19 +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
Jeremy Goldman
4a94ae431e
Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev am: d6913243a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409956
Change-Id: I399822cb875f3760d3919c06eaa84411f16bdd17
2021-05-04 09:48:59 +00:00
Jeremy Goldman
d6913243a1
Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev
2021-05-04 09:30:04 +00:00