From 43fccf984216b02e4544e1b8d2ea18ede1670a99 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Mon, 13 Nov 2017 10:09:09 -0800 Subject: [PATCH] Adding a link to Setting activity for the Home app The link is only visible if there is a default home add and it implements a settings activity Test: make -j20 RunSettingsRoboTests Change-Id: Iac5d0ebd561bed2e5b2f84236cdb728362ed8663 --- res/xml/app_default_settings.xml | 2 +- .../DefaultHomePreferenceController.java | 22 ++++++++++-- .../DefaultHomePreferenceControllerTest.java | 36 +++++++++++++++++++ 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/res/xml/app_default_settings.xml b/res/xml/app_default_settings.xml index 0204c644899..4d5c9d7c2c0 100644 --- a/res/xml/app_default_settings.xml +++ b/res/xml/app_default_settings.xml @@ -33,7 +33,7 @@ - homeActivities = new ArrayList<>(); + private ActivityInfo getOnlyAppInfo(List homeActivities) { final List appLabels = new ArrayList<>(); mPackageManager.getHomeActivities(homeActivities); @@ -88,6 +87,23 @@ public class DefaultHomePreferenceController extends DefaultAppPreferenceControl : null; } + @Override + protected Intent getSettingIntent(DefaultAppInfo info) { + final String packageName; + if (info.componentName != null) { + packageName = info.componentName.getPackageName(); + } else if (info.packageItemInfo != null) { + packageName = info.packageItemInfo.packageName; + } else { + return null; + } + + Intent intent = new Intent(Intent.ACTION_APPLICATION_PREFERENCES) + .setPackage(packageName) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + return mPackageManager.queryIntentActivities(intent, 0).size() == 1 ? intent : null; + } + public static boolean hasHomePreference(String pkg, Context context) { ArrayList homeActivities = new ArrayList<>(); PackageManager pm = context.getPackageManager(); diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java index ca5c10b1996..8a8cc2900a6 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java @@ -17,6 +17,9 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.anyList; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -26,6 +29,8 @@ import static org.mockito.Mockito.when; import android.content.ComponentName; import android.content.Context; +import android.content.Intent; +import android.content.pm.ResolveInfo; import android.os.UserManager; import android.support.v7.preference.Preference; @@ -42,6 +47,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; +import java.util.Arrays; + + @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class DefaultHomePreferenceControllerTest { @@ -112,4 +120,32 @@ public class DefaultHomePreferenceControllerTest { assertThat(DefaultHomePreferenceController.isHomeDefault(pkgName, mPackageManager)) .isFalse(); } + + @Test + public void testGetSettingIntent_homeHasNoSetting_shouldNotReturnSettingIntent() { + when(mPackageManager.getHomeActivities(anyList())).thenReturn( + new ComponentName("test.pkg", "class")); + assertThat(mController.getSettingIntent(mController.getDefaultAppInfo())).isNull(); + } + + @Test + public void testGetSettingIntent_homeHasOneSetting_shouldReturnSettingIntent() { + when(mPackageManager.getHomeActivities(anyList())).thenReturn( + new ComponentName("test.pkg", "class")); + when(mPackageManager.queryIntentActivities(any(), eq(0))).thenReturn( + Arrays.asList(mock(ResolveInfo.class))); + + Intent intent = mController.getSettingIntent(mController.getDefaultAppInfo()); + assertThat(intent).isNotNull(); + assertThat(intent.getPackage()).isEqualTo("test.pkg"); + } + + @Test + public void testGetSettingIntent_homeHasMultipleSettings_shouldNotReturnSettingIntent() { + when(mPackageManager.getHomeActivities(anyList())).thenReturn( + new ComponentName("test.pkg", "class")); + when(mPackageManager.queryIntentActivities(any(), eq(0))).thenReturn( + Arrays.asList(mock(ResolveInfo.class), mock(ResolveInfo.class))); + assertThat(mController.getSettingIntent(mController.getDefaultAppInfo())).isNull(); + } }