Commit Graph

908 Commits

Author SHA1 Message Date
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
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
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
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
Arc Wang
3576b10330 Merge "Cleanup Storage Settings" into sc-dev 2021-05-05 03:13: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
Jan Tomljanovic
b6cea338a0 Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev 2021-05-04 15:35:43 +00: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
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
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
Jan Tomljanovic
07bffff454 Launch SecurityHub fragment on SECURITY_SETTINGS intent when available.
Test: atest SettingsUnitTests
Test: adb shell am start -a android.settings.SECURITY_SETTINGS opens
SecurityHub screen (when SecurityHub enabled)
Test: assistant opens SecurityHub screen (when SecurityHub enabled) when
given instrucion to "open security settings"
Bug: 183930061

Change-Id: Ie8fcb2f2dce4cd0a2a84c6cd21a0a1c0b2b3665e
2021-04-29 17:38:52 +01:00
SongFerng Wang
112eb9d000 Merge "Ui show "No connection" when WiFi is turned on and no available network" into sc-dev am: 03fbae7fc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14281929

Change-Id: Id650d942223e5c097c1d16f38c5c6a05ce1566e8
2021-04-28 07:33:08 +00:00
SongFerng Wang
03fbae7fc5 Merge "Ui show "No connection" when WiFi is turned on and no available network" into sc-dev 2021-04-28 07:18:01 +00:00
Tom Hsu
b400088813 Merge "[Provider model] Show no connection during out of service." into sc-dev am: 463805b142
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187782

Change-Id: I6770d0bc2e3662a4e0b440ad69999552a7d73e58
2021-04-28 06:56:22 +00:00
Tom Hsu
463805b142 Merge "[Provider model] Show no connection during out of service." into sc-dev 2021-04-28 06:32:33 +00:00
SongFerngWang
8e0349a67b Ui show "No connection" when WiFi is turned on and no available network
Follow this table to display the UI.
https://docs.google.com/spreadsheets/d/1w7R7Q3EXkep7iO4VcgioNp00DWas3Xve5i1rWexAkz8/edit#gid=954295315
Bug: 183593681
Test: atest ProviderModelSliceTest
atest ProviderModelSliceHelperTest
atest InternetConnectivityPanelTest
make RunSettingsRoboTests -j

Change-Id: I103f9b2fafe4fc543452a74b7ee7b2e537f879b5
2021-04-28 12:35:37 +08:00
Christine Franks
23b55a9af4 Merge "Support vendor modes in color mode preference" into sc-dev am: 10da1de13e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14128858

Change-Id: Ifb3a89d234bed0e850695bb93e272d3ee5bea024
2021-04-23 06:45:04 +00:00
Christine Franks
10da1de13e Merge "Support vendor modes in color mode preference" into sc-dev 2021-04-23 06:31:18 +00:00
Christine Franks
cd61dd3359 Support vendor modes in color mode preference
Bug: 161299146
Test: atest SettingsUnitTests:ColorModePreferenceControllerTest and
atest SettingsUnitTests:ColorModePreferenceFragmentTest

Change-Id: I76ed54bb444170d4b8935f8f12bed599a946aa14
2021-04-22 16:50:43 -07:00
Yomna Nasser
214b17c77e Merge "Handle invalid subIds in Enable2gPreferenceController." into sc-dev am: 7299387774
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14218034

Change-Id: Ib0547ae0787972d73a4370f5e071dcde9cadbda4
2021-04-22 16:25:44 +00:00
Yomna Nasser
7299387774 Merge "Handle invalid subIds in Enable2gPreferenceController." into sc-dev 2021-04-22 16:00:02 +00:00
tom hsu
f482c28423 [Provider model] Show no connection during out of service.
- When device out of service, show "No connection" on preference summary.
 - Modify the logic of icon and summary.

Bug: 183944316
Test: atest SubscriptionsPreferenceControllerTest passed
Change-Id: I179632918a9145f27cec7d9c08e1c0b675fd1ef6
2021-04-22 21:56:42 +08:00
Yomna Nasser
e43f26294d Handle invalid subIds in Enable2gPreferenceController.
Implements improved handling of invalid subIds in the
"Allow 2G" controller + unit tests.

Bug: 185264531
Test: m & atest -c Enable2gPreferenceControllerTest
Change-Id: I7587f1a2a8150bbc6cc0864c9a13d0d910a26682
2021-04-22 00:14:29 +00:00
TreeHugger Robot
59620d9824 Merge "[Provider Model] Carrie Wi-Fi offload toggle request (panel)" into sc-dev am: b8f0a8e2dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251407

Change-Id: Icfc08e43fbea0b4b8fe483f7f19f22ea78872752
2021-04-21 08:39:48 +00:00
TreeHugger Robot
d42ace8ba2 Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev am: d4a4fead67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14236566

Change-Id: I369883434d2f25d0e253fcee30c63cf2c036512d
2021-04-21 08:39:13 +00:00
TreeHugger Robot
b8f0a8e2dc Merge "[Provider Model] Carrie Wi-Fi offload toggle request (panel)" into sc-dev 2021-04-21 08:19:23 +00:00
TreeHugger Robot
d4a4fead67 Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev 2021-04-21 08:19:13 +00:00
Weng Su
a320fb12a1 [Provider Model] Carrie Wi-Fi offload toggle request (panel)
- Do not set Carrier Network together when setting Mobile Data, if
carrner network provision enabled.

Bug: 182324921
Test: manual test
atest -c ProviderModelSliceTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanWorkerTest

Change-Id: Ic8b77fd7b43372f077ba1c8be8fd9a7c3bcff197
2021-04-20 22:36:04 +08:00
Weng Su
aeb6200bfe [Provider Model] Carrie Wi-Fi offload toggle request
- Remove the Advanced expandable list pattern and expose the items

- Add Carrie Wi-Fi offload toggle preference

- Add Carrier Wi-Fi network preference

- Do not set Carrier Network together when setting Mobile Data, if
carrner network provision enabled.

- Screenshot:
  https://screenshot.googleplex.com/8vMow53cvGfUAoj

Bug: 182324921
Test: manual test
atest -c CarrierWifiTogglePreferenceControllerTest \
         MobileDataPreferenceControllerTest \
	 WifiPickerTrackerHelperTest

Change-Id: I5a7f4cc6850fe76c0efee392c0c0c23cb41f5e1e
2021-04-20 07:58:20 +08:00
TreeHugger Robot
7fcfd25219 Merge "Fix TranscodeDisableCachePreferenceControllerTest" into sc-dev am: ab12e78a10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199750

Change-Id: I43ba102697afd7d07d89bac27b49863f47c2e235
2021-04-16 07:06:26 +00:00
Biswarup Pal
48bb439db6 Fix TranscodeDisableCachePreferenceControllerTest
Test: TranscodeDisableCachePreferenceControllerTest
Bug: 185483742
Change-Id: Ie448929fb50a49a0641baf6456df11430bb9f1c6
2021-04-15 20:08:48 +00:00
Biswarup Pal
940cb585fa Merge "Implement controller to disable transcoding cache" into sc-dev am: acb5bebb3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186626

Change-Id: If620a754483bc848c5b5eb5ec68e80cafc00854a
2021-04-15 11:37:22 +00:00
Biswarup Pal
acb5bebb3d Merge "Implement controller to disable transcoding cache" into sc-dev 2021-04-15 11:24:27 +00:00
TreeHugger Robot
fdfe60d87e Merge "Cleanup Storage Settings" into sc-dev am: fce594ad7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182146

Change-Id: I2871f2febd498e3f71e264327bbe6d911b8d4dd5
2021-04-15 02:44:40 +00:00
TreeHugger Robot
fce594ad7f Merge "Cleanup Storage Settings" into sc-dev 2021-04-15 02:28:35 +00:00
TreeHugger Robot
3991ebebe2 Merge "Replace the hidden API to public API or other alternatives" into sc-dev am: 5467d0f7aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173731

Change-Id: I1f0f0e4776c530a14caec54c905f477c6cef81c2
2021-04-14 18:04:10 +00:00
TreeHugger Robot
5467d0f7aa Merge "Replace the hidden API to public API or other alternatives" into sc-dev 2021-04-14 17:47:41 +00:00
Biswarup Pal
4da3dd1458 Implement controller to disable transcoding cache
This is to provide users with control over whether to disable
transcoding cache or not.

By default we keep the transcoding cache enabled.

The controller resides within the Media transcoding settings under
Developer Options.

Test: Manual. Unit tests added.
Bug: 185246580
Change-Id: I5cc85e4a254c87b5c84c32a303e8294c918748c2
2021-04-14 17:15:22 +00:00
Sally Yuen
5e89a42c2a Merge "Call ColorDisplayManager for Extra Dim/RBC state" into sc-dev am: 182c812b1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172316

Change-Id: Id1e92c5cbaae8438d25aefe33ba3d88f9d29cc79
2021-04-14 16:29:45 +00:00
Sally Yuen
182c812b1b Merge "Call ColorDisplayManager for Extra Dim/RBC state" into sc-dev 2021-04-14 16:05:59 +00:00
Arc Wang
192fd24f26 Cleanup Storage Settings
Bug: 183078080
Test: make
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo
      make RunSettingsRoboTests
      ROBOTEST_FILTER=com.android.settings.deviceinfo.storage
      atest com.android.settings.deviceinfo
      atest com.android.settings.deviceinfo.storage
Change-Id: I901f5f7999ea94dafb72a2517a11e2ff1fd51b42
2021-04-14 21:37:46 +08:00
lucaslin
09bbb51d29 Replace the hidden API to public API or other alternatives
Some of connectivity related files are going to be a part of
mainline module, so the external callers cannot call its hidden
API.
Replace the hidden API to public API or other alternatives from
the callers side.

Bug: 182859030
Test: 1. Remove "framework-connectivity.impl"
      2. atest SettingsUnitTests:InternetUpdaterTest
      3. atest SettingsUnitTests:ProviderModelSliceHelperTest
      4. atest SettingsUnitTests:MobileNetworkUtilsTest
      5. make RunSettingsRoboTests \
         ROBOTEST_FILTER=AppDataUsagePreferenceControllerTest
      6. make RunSettingsRoboTests \
         ROBOTEST_FILTER=TetherPreferenceControllerTest
      7. make RunSettingsRoboTests \
         ROBOTEST_FILTER=WifiDetailPreferenceController2Test
      8. make RunSettingsRoboTests \
         ROBOTEST_FILTER=ContextualWifiSliceTest
Change-Id: Idd1ca57d8f2790070e9c401936c5af2a05bcfe9d
2021-04-14 11:36:54 +00:00
sallyyuen
fefb447526 Call ColorDisplayManager for Extra Dim/RBC state
- Move junit test into unit test folder
- Settings resources ids are different from the junit test ids
so we need to find the correct resource id
- ColorDisplayManager will not update in time before the controller
is checked, and it can't be mocked since it's a final class
Bug: 170970675
Test: manual, atest ReduceBrightColorsPreferenceControllerTest

Change-Id: I57bfdd8294c5b6e147b4e11ae97b6b56f6121343
2021-04-13 17:42:25 -07:00
SongFerng Wang
8991225949 Merge "The Network Select shows wrong operator name" into sc-dev am: c7d2169120
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140145

Change-Id: I7e70fc63e1e17bddfe38455717af5e24d9a9df7c
2021-04-12 02:49:09 +00:00
SongFerng Wang
c7d2169120 Merge "The Network Select shows wrong operator name" into sc-dev 2021-04-12 02:45:52 +00:00
Suprabh Shukla
a4d354f673 Merge "Changes to "Alarms and Reminders" permission" into sc-dev am: 39086c24fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14095813

Change-Id: I644442b4d41b343bfc1aebcc2c42ac2f9dc7ce82
2021-04-09 23:00:09 +00:00
Suprabh Shukla
39086c24fd Merge "Changes to "Alarms and Reminders" permission" into sc-dev 2021-04-09 22:27:50 +00:00
Sally Yuen
5da6456c18 Merge "Get Extra Dim availability through ColorDisplayManager" into sc-dev am: 550072d0fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14096656

Change-Id: Ib8e66116813f18fa3d38b5ba973399089e20dbd8
2021-04-09 17:08:38 +00:00