PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Register most app info related controllers in xml" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-30 03:17:45 +00:00
committed by Android (Google) Code Review
parent 78df73f00a b5c651c939
commit 4ae4cd5c8d
40 changed files with 299 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor
View File

@@ -1,20 +1,8 @@
com.android.settings.applications.appinfo.AppActionButtonPreferenceController
com.android.settings.applications.appinfo.AppBatteryPreferenceController
com.android.settings.applications.appinfo.AppDataUsagePreferenceController
com.android.settings.applications.appinfo.AppHeaderViewPreferenceController
com.android.settings.applications.appinfo.AppInstallerInfoPreferenceController
com.android.settings.applications.appinfo.AppMemoryPreferenceController
com.android.settings.applications.appinfo.AppNotificationPreferenceController
com.android.settings.applications.appinfo.AppOpenByDefaultPreferenceController
com.android.settings.applications.appinfo.AppPermissionPreferenceController
com.android.settings.applications.appinfo.AppStoragePreferenceController
com.android.settings.applications.appinfo.AppVersionPreferenceController
com.android.settings.applications.appinfo.DrawOverlayDetailPreferenceController
com.android.settings.applications.appinfo.ExternalSourceDetailPreferenceController
com.android.settings.applications.appinfo.InstantAppButtonsPreferenceController
com.android.settings.applications.appinfo.InstantAppDomainsPreferenceController
com.android.settings.applications.appinfo.PictureInPictureDetailPreferenceController
com.android.settings.applications.appinfo.WriteSystemSettingsPreferenceController
com.android.settings.bluetooth.BluetoothDeviceNamePreferenceController
com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController
com.android.settings.bluetooth.BluetoothSwitchPreferenceController

4
tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java
View File

@@ -63,8 +63,8 @@ public class AppDataUsagePreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application.getApplicationContext());
mController = spy(
new AppDataUsagePreferenceController(mContext, mFragment, null /* lifecycle */));
mController = spy(new AppDataUsagePreferenceController(mContext, "test_key"));
mController.setParentFragment(mFragment);
}
@Test

3
tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java
View File

@@ -102,7 +102,8 @@ public class AppInfoPreferenceControllerBaseTest {
private boolean preferenceUpdated;
private TestPreferenceController(AppInfoDashboardFragment parent) {
super(RuntimeEnvironment.application, parent, "TestKey");
super(RuntimeEnvironment.application, "TestKey");
setParentFragment(parent);
}
@Override

14
tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java
View File

@@ -74,7 +74,9 @@ public class AppInstallerInfoPreferenceControllerTest {
when(mPackageManager.getInstallerPackageName(anyString())).thenReturn(installerPackage);
when(mPackageManager.getApplicationInfo(eq(installerPackage), anyInt()))
.thenReturn(mAppInfo);
mController = new AppInstallerInfoPreferenceController(mContext, mFragment, "Package1");
mController = new AppInstallerInfoPreferenceController(mContext, "test_key");
mController.setPackageName("Package1");
mController.setParentFragment(mFragment);
}
@Test
@@ -82,7 +84,7 @@ public class AppInstallerInfoPreferenceControllerTest {
when(mUserManager.isManagedProfile()).thenReturn(true);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -90,17 +92,19 @@ public class AppInstallerInfoPreferenceControllerTest {
when(mUserManager.isManagedProfile()).thenReturn(false);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
public void getAvailabilityStatus_hasAppLabel_shouldReturnAvailable() {
when(mUserManager.isManagedProfile()).thenReturn(false);
when(mAppInfo.loadLabel(mPackageManager)).thenReturn("Label1");
mController = new AppInstallerInfoPreferenceController(mContext, mFragment, "Package1");
mController = new AppInstallerInfoPreferenceController(mContext, "test_key");
mController.setPackageName("Package1");
mController.setParentFragment(mFragment);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test

7
tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
@@ -62,7 +61,8 @@ public class AppNotificationPreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = spy(new AppNotificationPreferenceController(mContext, mFragment));
mController = spy(new AppNotificationPreferenceController(mContext, "test_key"));
mController.setParentFragment(mFragment);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
@@ -99,7 +99,8 @@ public class AppNotificationPreferenceControllerTest {
when(mFragment.getActivity()).thenReturn(activity);
when(activity.getIntent()).thenReturn(intent);
AppNotificationPreferenceController controller =
new AppNotificationPreferenceController(mContext, mFragment);
new AppNotificationPreferenceController(mContext, "test");
controller.setParentFragment(mFragment);
assertThat(controller.getArguments().containsKey(EXTRA_FRAGMENT_ARG_KEY)).isTrue();
assertThat(controller.getArguments().getString(EXTRA_FRAGMENT_ARG_KEY)).isEqualTo("test");

3
tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java
View File

@@ -61,7 +61,8 @@ public class AppOpenByDefaultPreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application.getApplicationContext();
mController = spy(new AppOpenByDefaultPreferenceController(mContext, mFragment));
mController = spy(new AppOpenByDefaultPreferenceController(mContext, "preferred_app"));
mController.setParentFragment(mFragment);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}

7
tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
View File

@@ -63,7 +63,10 @@ public class AppPermissionPreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new AppPermissionPreferenceController(mContext, mFragment, "Package1");
mController = new AppPermissionPreferenceController(mContext, "permission_settings");
mController.setPackageName("package1");
mController.setParentFragment(mFragment);
when(mScreen.findPreference(any())).thenReturn(mPreference);
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
@@ -133,7 +136,7 @@ public class AppPermissionPreferenceControllerTest {
mController.handlePreferenceTreeClick(mPreference);
verify(mActivity).startActivityForResult(argThat(intent-> intent != null &&
verify(mActivity).startActivityForResult(argThat(intent -> intent != null &&
Intent.ACTION_MANAGE_APP_PERMISSIONS.equals(intent.getAction())), anyInt());
}
}

4
tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java
View File

@@ -57,8 +57,8 @@ public class AppStoragePreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application.getApplicationContext();
mController =
spy(new AppStoragePreferenceController(mContext, mFragment, null /* lifecycle */));
mController = spy(new AppStoragePreferenceController(mContext, "key"));
mController.setParentFragment(mFragment);
}
@Test

3
tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java
View File

@@ -48,7 +48,8 @@ public class AppVersionPreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new AppVersionPreferenceController(mContext, mFragment);
mController = new AppVersionPreferenceController(mContext, "test_key");
mController.setParentFragment(mFragment);
}
@Test

11
tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java
View File

@@ -57,7 +57,8 @@ public class DrawOverlayDetailPreferenceControllerTest {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
mController = spy(new DrawOverlayDetailPreferenceController(mContext, mFragment));
mController = spy(new DrawOverlayDetailPreferenceController(mContext, "key"));
mController.setParentFragment(mFragment);
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
}
@@ -67,7 +68,7 @@ public class DrawOverlayDetailPreferenceControllerTest {
when(mUserManager.isManagedProfile()).thenReturn(true);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -76,7 +77,7 @@ public class DrawOverlayDetailPreferenceControllerTest {
when(mFragment.getPackageInfo()).thenReturn(new PackageInfo());
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -87,7 +88,7 @@ public class DrawOverlayDetailPreferenceControllerTest {
when(mFragment.getPackageInfo()).thenReturn(info);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -98,7 +99,7 @@ public class DrawOverlayDetailPreferenceControllerTest {
when(mFragment.getPackageInfo()).thenReturn(info);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test

11
tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java
View File

@@ -54,8 +54,9 @@ public class ExternalSourceDetailPreferenceControllerTest {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
mController = spy(
new ExternalSourceDetailPreferenceController(mContext, mFragment, "Package1"));
mController = spy(new ExternalSourceDetailPreferenceController(mContext, "test_key"));
mController.setPackageName("Package1");
mController.setParentFragment(mFragment);
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
}
@@ -65,7 +66,7 @@ public class ExternalSourceDetailPreferenceControllerTest {
when(mUserManager.isManagedProfile()).thenReturn(true);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -74,7 +75,7 @@ public class ExternalSourceDetailPreferenceControllerTest {
doReturn(false).when(mController).isPotentialAppSource();
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -83,7 +84,7 @@ public class ExternalSourceDetailPreferenceControllerTest {
doReturn(true).when(mController).isPotentialAppSource();
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test

11
tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java
View File

@@ -62,7 +62,7 @@ public class InstantAppDomainsPreferenceControllerTest {
private InstantAppDomainsPreferenceController mController;
@Before
public void setUp() throws PackageManager.NameNotFoundException {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
@@ -70,7 +70,8 @@ public class InstantAppDomainsPreferenceControllerTest {
packageInfo.applicationInfo = mAppInfo;
packageInfo.packageName = "Package1";
when(mFragment.getPackageInfo()).thenReturn(packageInfo);
mController = new InstantAppDomainsPreferenceController(mContext, mFragment);
mController = new InstantAppDomainsPreferenceController(mContext, "test_key");
mController.setParentFragment(mFragment);
}
@Test
@@ -79,7 +80,7 @@ public class InstantAppDomainsPreferenceControllerTest {
(InstantAppDataProvider) (i -> false));
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -88,12 +89,12 @@ public class InstantAppDomainsPreferenceControllerTest {
(InstantAppDataProvider) (i -> true));
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void updateState_shouldSetPreferenceTitle() {
final String[] domain = { "Domain1" };
final String[] domain = {"Domain1"};
final ArraySet<String> domains = new ArraySet<>();
domains.add(domain[0]);
final List<IntentFilterVerificationInfo> infoList = new ArrayList<>();

10
tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java
View File

@@ -52,8 +52,10 @@ public class PictureInPictureDetailPreferenceControllerTest {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mController = spy(
new PictureInPictureDetailPreferenceController(mContext, mFragment, "Package1"));
mController = spy(new PictureInPictureDetailPreferenceController(mContext, "test_key"));
mController.setPackageName("Package1");
mController.setParentFragment(mFragment);
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
}
@@ -63,7 +65,7 @@ public class PictureInPictureDetailPreferenceControllerTest {
doReturn(false).when(mController).hasPictureInPictureActivites();
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -71,7 +73,7 @@ public class PictureInPictureDetailPreferenceControllerTest {
doReturn(true).when(mController).hasPictureInPictureActivites();
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test

3
tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java
View File

@@ -57,7 +57,8 @@ public class WriteSystemSettingsPreferenceControllerTest {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
mController = spy(new WriteSystemSettingsPreferenceController(mContext, mFragment));
mController = spy(new WriteSystemSettingsPreferenceController(mContext, "test_key"));
mController.setParentFragment(mFragment);
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
}

8
tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java
View File

@@ -44,12 +44,12 @@ public class PreferenceCategoryControllerTest {
public void setUp() {
mContext = RuntimeEnvironment.application;
mChildren = new ArrayList<>();
mController = new PreferenceCategoryController(mContext, "pref_key", mChildren);
mController = new PreferenceCategoryController(mContext, "pref_key").setChildren(mChildren);
}
@Test
public void isAvailable_noChildren_true() {
assertThat(mController.isAvailable()).isTrue();
public void isAvailable_noChildren_false() {
assertThat(mController.isAvailable()).isFalse();
}
@Test
@@ -57,6 +57,7 @@ public class PreferenceCategoryControllerTest {
final AbstractPreferenceController child = mock(AbstractPreferenceController.class);
when(child.isAvailable()).thenReturn(true);
mChildren.add(child);
mController.setChildren(mChildren);
assertThat(mController.isAvailable()).isTrue();
}
@@ -66,6 +67,7 @@ public class PreferenceCategoryControllerTest {
final AbstractPreferenceController child = mock(AbstractPreferenceController.class);
when(child.isAvailable()).thenReturn(false);
mChildren.add(child);
mController.setChildren(mChildren);
assertThat(mController.isAvailable()).isFalse();
}