Commit Graph

103 Commits

Author SHA1 Message Date
xinghailu
897fd74731 Cleanup some plurals in Settings
Change <one> to <1> in string res file, and update related java files.
Test: Update, existing test still pass.
bug: 199230342

Change-Id: Idd0ba3c6adc060da21574d98f8ed765fae00cef8
2022-12-22 16:05:13 +08:00
Wei Wang
fcd3c608bf Ignore all failing tests in Settings for now in order to unblock ATP V2
migration

Test: m RunSettingsRoboTests passed on desktop
Change-Id: I2450aaa083aabdf224e070f588441bb01206972b
Bug: 252671269
2022-10-13 17:29:36 +08:00
Sorin Basca
c1c3a84fdc Use Mockito 4.6.1 API
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
2022-07-13 06:39:26 +01:00
Salud Lemus
54cb55b87e Add unit tests for verifying title
Bug: 236259020
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacySettingsTest

Change-Id: I520c94818951acce25c5d8a090b6d59feff93a1c
2022-06-22 17:18:10 -07:00
Jonathan Scott
b7f4f56cad Add missing settings strings.
Also re-enable and fix tests.

Test: manual
Fixes: 226183482
Fixes: 218799125
Fixes: 219375624

Change-Id: I9605f1f4e2e834baf63e015e96639567c5481b5f
2022-05-05 09:12:59 +00:00
Prabal Singh
3e2d7f4581 Remove extra argument WorkPolicyUtil constructor
Only constructor is required for WorkPolicyInfo constructor. The other
dependencies can be derives

Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I7f35e5ed344d452190b333aad7fa823a010d17b3
2022-04-28 15:21:18 +01:00
Prabal Singh
67007e5933 Use settingslib util methods for work policy info
Bug: b/229889270
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I0d968732a4dd601955e18b2ebb2af365638b450f
2022-04-23 20:35:41 +01:00
Tsung-Mao Fang
34f0724a63 Ignore all broken tests
Test only should fix these broken tests soon.

Test: Attach ag/16819270 and run pass all tests
Bug: 218799125
Bug: 218798403
Bug: 218798003
Change-Id: I4914adb475802211d9918a416950b01854c9a390
2022-02-10 10:18:42 +00:00
Yanli Wan
2dd111b3c3 Update financed device info screen
Bug: 217375582
Test: manual
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacySettingsTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsEnterprisePreferenceTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsFinancedPreferenceTest
Change-Id: Ie0045c7f97a331640209efd1118d841eb0ab1b6f
2022-02-07 16:58:26 -08:00
Stanley Wang
cee6346ce9 Ignore tests to avoid Settings presubmit test failure.
Bug: 215660413
Test: run robo test
Change-Id: I9cb04f5fee9463d40954509c087eb428f16e3b68
2022-01-21 17:57:53 +08:00
Tsung-Mao Fang
aa19771a37 Ignore/Fix broken tests
Fix: 214943221
Fix: 215070875
Bug: 215071960
Bug: 215071948
Bug: 215072120
Test: run robo test
Change-Id: Id11c8461a2cb11cba96feebbfb0337b096eb3a17
2022-01-18 17:39:24 +08:00
Tsung-Mao Fang
7be195f15a Fix broken tests
Test: Run robo test
Change-Id: I0d466e95c8d63703e05d5b6f0e2a81e43b468ed7
2022-01-18 15:37:30 +08:00
arangelov
c5346baaa2 Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag
The flag prevents the DPC screen from showing with the in-app
transition.

Fixes: 198422800
Test: manual
Change-Id: Ie6debb55396eb5ce48a21b1ef52c89612b1c7ffd
2021-10-07 19:27:38 +01:00
Jan Tomljanovic
c6667337ca Enable controllers to use a custom key.
Test: atest SettingsUnitTests
Test: m -j45 RunSettingsRoboTests
Bug: 191763369
Change-Id: I48eea95613600580c80c8850f0a3fd543a7e0a43
2021-06-25 15:35:53 +01:00
Sunny Shao
794a894aa7 Fix testGetDeviceOwnerDisclosure test case fail
- Remove the learn more part which already include in the FooterPreference.

Fixes: 190889944
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImplTest
Change-Id: Ia6b7962019a3ec30b72ca6d64159811ab98fc13b
2021-06-16 13:40:55 +08:00
Felipe Leme
e89c2fd4b8 Further refactoring on ActionDisabledByAdminDialog classes.
Bug: 184107103
Bug: 188836559

Test: m -j RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest
Test: atest ActionDisabledLearnMoreButtonLauncherImplTest
Test: adb shell am start -e android.app.extra.RESTRICTION no_install_unknown-sources -a android.settings.SHOW_ADMIN_SUPPORT_DETAILS
Test: manual verification with CtsVerifier

Change-Id: I3c4056d82834b5e2a4afbd958be7c9d0b9af543e
2021-05-27 11:27:33 -07:00
arangelov
d79ab00524 Update ActionDisabledByAdminDialogHelper
- For managed devices, "Learn more" takes the user to a support
page
- Put back the "If you have questions, contact your IT admin"
dialog content text
- Update header to 'Blocked by your IT admin' for managed devices

Fixes: 184107103
Test: manual
Test: atest ActionDisabledByAdminDialogHelperTest
Test: atest ActionDisabledLearnMoreButtonLauncherImplTest
Change-Id: Ie5b8a21b9ba295435d5709f9b0374035141d319a
2021-05-18 15:40:46 +01:00
Salud Lemus
9068481299 Fix search index for a financed device
Now with two preference controllers, one for enterprise device and one
for financed device, the search index issue (querying "Financed device
info" in Settings does not show a search result) is fixed. The financed
preference controller is used when the device is a financed device.
Otherwise, the enterprise preference controller is used.

Bug: 183551684
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=FinancedPrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacyPreferenceControllerHelperTest

Change-Id: I051144ec9004f86456285078ebb1c72266f80a55
2021-04-20 12:17:39 -07:00
Rajeev Kumar
cafc769a51 Merge "Update Managed Device Info text for a financed device" into sc-dev 2021-03-23 20:55:27 +00:00
Salud Lemus
a9a24372fd Update Managed Device Info text for a financed device
Bug: 183448705
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacyPreferenceControllerTest

Change-Id: Iea2567e7943b122c6c6d2772380f8ddd57066a3f
2021-03-23 16:39:56 +00:00
Salud Lemus
930df91e66 Update Privacy Settings text for a financed device
Bug: 182802692
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacySettingsTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsEnterprisePreferenceTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsFinancedPreferenceTest

Change-Id: Icc131252430cd147e2a06ba2aa260f6ea26734bb
2021-03-23 16:06:01 +00:00
Rajeev Kumar
815558188f Merge "Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device" into sc-dev 2021-03-16 16:50:02 +00:00
Salud Lemus
0e0247e5e4 Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device
Bug: 182839352
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest

Change-Id: I42bb9ce9a624fa20cd755af2d323b4c4f94048f7
2021-03-16 01:42:07 +00:00
Salud Lemus
52565ad5e9 Remove default admin support message for an Enterprise device
Bug: 182195172
Test: m RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest

Change-Id: Ie844eee14ff0cc6a1c2f9dd0485c865f4e5e3e72
2021-03-09 16:16:33 +00:00
Salud Lemus
b45d87715a Update Action Not Allowed Dialog text for a financed device
Bug: 173826319
Bug: 158157476
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest

Change-Id: Iefeb0b653764952e409dfd862d9cc54c4f5e7fc9
2021-03-08 19:06:13 +00:00
Tsung-Mao Fang
8e25dcaece Fix broken test
- Remove a test which is a non-public method.
- Re-implemented the test.

Fix: 180874869
Test: Run robo test
Change-Id: Ic9716278653c874a8f7d98b56b7e32f19d157382
2021-02-22 07:34:30 +00:00
Lorenzo Colitti
cacf9aa485 Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.
It is only used in GlobalHttpPreferenceController. Move it there.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I62c589679052b276927d057d3d5d084bbfb57626
2021-02-18 16:44:53 +09:00
Lorenzo Colitti
5c9a042370 Stop using ConnectivityManager for VPNs.
These methods have all moved to VpnManager.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
2021-02-18 16:02:08 +09:00
Tsung-Mao Fang
829c7b7b24 Remove a test case for fixing broken pesubmit
Change-Id: Iaa0477d22dc680d08b5d5614fec2c7eb3154465a
Fix: 178567560
Test: Run presubmit process
(cherry picked from commit cefdfc7bc9)
2021-01-29 20:21:04 +00:00
Jason Parks
9f424cdec2 Launch DO/PO sepecific settings when parental are enabled.
Test: make RunSettingsRoboTests && manual
Bug: 161861348

Change-Id: I73ce27d0aa740f47e6ed3e4be9bee4d5eaf039ad
2020-11-30 21:29:16 +00:00
Edgar Wang
c2e4513fb6 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: I36829e0055437dab79d9e5339ac002a87a4b874f
2020-08-04 18:12:48 +08:00
Ivan Podogov
2c3ba517fe Use AOSP intent for Work Policy Info
Bug: 134391103
Test: make, GTS, robotest
Change-Id: I8870621538aa7d2d4a5313efdf41119fd36daee5
2019-10-29 10:02:06 +00:00
Ivan Podogov
75a10d1fd2 Add "Your work policy info" entry in Privacy settings
Bug: 132904820
Test: manual
Change-Id: Id706d450c3ad6a6a8c1e402d39d18e048cdb6519
2019-06-14 13:07:21 +01:00
Irina Dumitrescu
e69f336850 Disable "Learn more" button for unknown apps disabled by admin on secondary profiles.
Test: packages/apps/Settings/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
Test: packages/apps/Settings/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
Fixes:118881180
Change-Id: I8f6dbd9decba331fbe0a3495a2989f570f2afa67
2019-03-29 13:18:53 +00:00
James Lemieux
f1dade40d2 Use binary resource support in robolectric
The resources available to tests are now exactly the merged resources
located in the APK under test.

Bug: 74359828
Test: make -j56 RunSettingsRoboTests
Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b
2018-12-12 19:53:49 -08:00
Alex Chau
eaf78937d5 Add EnterprisePrivacySettings as injectable category
- Also add order for EnterprisePrivacySettings manifest

Bug: 120414731
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DashboardFragmentRegistryTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacySettingsTest
Change-Id: I30b555873aad66aa1432ae8ebb11417ddf237a07
2018-12-03 21:31:25 +00:00
James Lemieux
3a55de44c5 Prepare tests for impending robolectric merge
Some ShadowUserManager function moved into the basic shadow in
robolectric proper and has been removed from the Settings
ShadowUserManager.

Test: make -j56 RunSettingsRoboTests
Change-Id: I38647dae5d16bc79bc7925ca139c9362a2035393
2018-11-20 16:40:57 -08:00
Fan Zhang
cdf284b732 Make Settings robotest work with tot Robolectric
Bug: 116278591
Test: make -j RunSettingsRoboTests
Change-Id: I32cb2fcf6094675f79d2fc24702ef6298a9691e4
2018-10-31 17:59:17 -07:00
Philip P. Moltmann
035ea3b0d1 Use new RestrictedLockUtils API
This is made necessary by changes to the SystemAPI the lib relies on.

Test: RunSettingsRoboTests
Bug: 116798569
Change-Id: I2812ce9e58e3fb15a5579ddc10cd0edf33d0ed44
2018-10-09 12:39:19 -07:00
Lenka Trochtova
2f4558d3fc Revert the mandatory backups feature.
Bug: 79736299
Test: make RunSettingsGoogleRoboTests
Test: make RunSettingsRoboTests

Change-Id: Ie9702664c0fb4daccdee74eac6080c959fe1b608
2018-09-12 11:52:11 +02:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Fan Zhang
c7162cd24d Reorder and clean up imports.
Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
2018-06-18 15:45:09 -07:00
Fan Zhang
fc7188d822 Clean up DeviceAdminSetting: make it into DashboardFragment
Change-Id: Ib5634f782daef15ab317175084c6813d6b8a8bb7
Fixes: 110207366
Test: robo
2018-06-18 18:09:01 +00:00
Fan Zhang
ca6d86c5ab Move device admin viewer/adder to specialaccess package.
Bug: 110207366
Test: robo
Change-Id: I51552dcc5ec6525040cfde17087b7f3f6b21b581
2018-06-15 08:56:14 -07:00
HJ ChangLiao
5693be2863 Replace PackageManagerWrapper with PackageManager
Replace all SettingsLib/PackageManagerWrapper in Settings,
by PackageManager,
Remove ShadowPackageManagerWrapper.

Bug: 62067063
Test: make RunSettingsRoboTests
Change-Id: I6d1af55c13d80c1907b98b21e0207cc903cd9b1f
2018-04-24 15:12:31 +08:00
Aurimas Liutikas
e0069d332d Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
2018-04-20 12:52:29 -07:00
arangelov
cf1e59a960 Change "More details" to "Learn more" in policy transparency dialog.
Screenshot: https://screenshot.googleplex.com/5xrwW3g29qa.png

Bug: 77618738
Test: none
Change-Id: I464f492cd6b1468b85b5a691c29ae7a982ecebff
2018-04-06 14:31:32 +01:00
Tony Mak
a8c53f7dcb Merge "We should show custom title for suspend app dialog" into pi-dev 2018-04-04 10:38:18 +00:00
TreeHugger Robot
4720ba39e3 Merge "Remove wrapper for ConnectionManager/IPackageManager" into pi-dev 2018-04-03 18:31:39 +00:00
Tony Mak
cbc3a6a1de We should show custom title for suspend app dialog
BUG: 77523074

Test: Suspend an app, observe the new title.
Test: m -j RunSettingsRoboTest

Change-Id: Ide0329422e68b5ed6418365f2d0b0e0d11f0dec7
2018-04-03 17:54:13 +00:00