Commit Graph

81641 Commits

Author SHA1 Message Date
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
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
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
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
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
c26fabff2a Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev 2021-05-05 04:12:38 +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
lucaslin
1fbe34fbc7 Use [set|get]PrivateDnsMode directly
The value of PRIVATE_DNS_MODE_* has changed from String to int and
ConnectivityManager provides 2 new APIs to set and get private
DNS mode, the caller can use them directly and doesn't need to update
Settings by itself.

Bug: 185311744
Test: 1. make RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
      2. make RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Change-Id: I47706efe9c53a00438fdec97fda244638cecb3dc
Merged-In: I47706efe9c53a00438fdec97fda244638cecb3dc
    (Cherry-picked from ag/14230401)
2021-05-05 03:26:58 +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
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
da602e196e Merge "Set summary if VPN is AlwaysOn Type" into sc-dev 2021-05-05 01:06:01 +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
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
f164cb1976 Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev 2021-05-04 19:28:31 +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
cc28a0826e Merge "Add null check for app labels" into sc-dev 2021-05-04 17:03:37 +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
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
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
Hugh Chen
139ff59346 Fix the section below "Pair new device" moves up a few pixels
This CL add new controller that used to show the summary when
bluetooth is off. It can prevent a jank since the UI is decided
before render.

Bug: 182232469
Test: make RunSettingsRoboTests -j56
Change-Id: I78eb757cd1b636fbb18028fb2294861467bc6eba
2021-05-04 20:45:41 +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
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
Jeremy Goldman
cf8ac147b0 Set summary if VPN is AlwaysOn Type
Bug: 187124456
Test: atest -c SettingsUnitTests
Change-Id: I64158b90921c5766e26d5e438b1d005d5fe9cbaa
2021-05-04 16:32:54 +08:00
Hugh Chen
2deb2829ea RESTRICT AUTOMERGE Fix unable to send file via OPP
Bluetooth app will indicate BluetoothOppReceiver to receive
device picker intent. But for fix the security issue we
removed the setClassName() method in ag/14111132 to avoid attack.
It causes BluetoothOppReceiver cannot receive the intent.

This CL will compare to calling package name with launch package name.
If they are not equal, the setClassName() will not invoke.

Bug: 186490534
Bug: 179386960
Bug: 179386068

Test: make RunSettingsRoboTests -j56
Change-Id: Ia51528f2a44ab73edbc86899ca0846d3262fe1f0
(cherry picked from commit bb5be240c0)
2021-05-04 08:17:35 +00:00
Hugh Chen
f727d5cf2a RESTRICT AUTOMERGE Fix unable to send file via OPP
Bluetooth app will indicate BluetoothOppReceiver to receive
device picker intent. But for fix the security issue we
removed the setClassName() method in ag/14111132 to avoid attack.
It causes BluetoothOppReceiver cannot receive the intent.

This CL will compare to calling package name with launch package name.
If they are not equal, the setClassName() will not invoke.

Bug: 186490534
Bug: 179386960
Bug: 179386068

Test: make RunSettingsRoboTests -j56
Change-Id: Ia51528f2a44ab73edbc86899ca0846d3262fe1f0
(cherry picked from commit bb5be240c0)
2021-05-04 08:11:01 +00:00
Jeremy Goldman
050f7a7657 If the CarrierConfigManager is still null, return that the preference is
not available.

Test: atest -c VideoCallingPreferenceControllerTest
Bug: 186594185
Change-Id: I4650d9f77f6a4a0cb84d6e20f02e4ab1d1841131
2021-05-04 15:05:53 +08:00
changbetty
01cc97f382 Assign StaticIpConfiguration builder value to global variable
[Root Cause]
Due to call by reference for Object, we pass the StaticIpConfiguration
to method. But in method we new the staticIpConfiguration builder
and re-assign builder to parameter, it will release when the method is ended.
The value in Builder will not be set to global variable.

[Solution]
Assign the value in StaticIpConfiguration builder to global variable
directly.

Bug: 186489618
Test: manual test
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
Change-Id: I1a6aee31e6977be42792440c3667db2557a20c4e
2021-05-04 14:40:31 +08:00
Menghan Li
4ec4cf32f1 Merge "[Material Next] Typography for font style" into sc-dev 2021-05-04 06:22:58 +00:00
Hugh Chen
51755e9a33 RESTRICT AUTOMERGE Fix unable to send file via OPP
Bluetooth app will indicate BluetoothOppReceiver to receive
device picker intent. But for fix the security issue we
removed the setClassName() method in ag/14111132 to avoid attack.
It causes BluetoothOppReceiver cannot receive the intent.

This CL will compare to calling package name with launch package name.
If they are not equal, the setClassName() will not invoke.

Bug: 186490534
Bug: 179386960
Bug: 179386068

Test: make RunSettingsRoboTests -j56
Change-Id: Ia51528f2a44ab73edbc86899ca0846d3262fe1f0
(cherry picked from commit bb5be240c0)
2021-05-04 06:04:05 +00:00