Merge "Remove unnecessary methods from TileUtils." (85d4e291) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java

+8 −55

Original line number	Diff line number	Diff line
		@@ -20,10 +20,8 @@ import android.content.Context;
		import android.content.IContentProvider;
		import android.content.Intent;
		import android.content.pm.ActivityInfo;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.content.res.Resources;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.RemoteException;
		@@ -43,7 +41,6 @@ import java.util.Map;

		public class TileUtils {

		private static final boolean DEBUG = false;
		private static final boolean DEBUG_TIMING = false;

		private static final String LOG_TAG = "TileUtils";
		@@ -70,7 +67,7 @@ public class TileUtils {
		/**
		* @See {@link #EXTRA_SETTINGS_ACTION}.
		*/
		private static final String IA_SETTINGS_ACTION = "com.android.settings.action.IA_SETTINGS";
		public static final String IA_SETTINGS_ACTION = "com.android.settings.action.IA_SETTINGS";

		/**
		* Same as #EXTRA_SETTINGS_ACTION but used for the platform Settings activities.
		@@ -219,9 +216,9 @@ public class TileUtils {
		// Only add Settings for this user.
		getTilesForAction(context, user, SETTINGS_ACTION, cache, null, tiles, true);
		getTilesForAction(context, user, OPERATOR_SETTINGS, cache,
		OPERATOR_DEFAULT_CATEGORY, tiles, false, true);
		OPERATOR_DEFAULT_CATEGORY, tiles, false);
		getTilesForAction(context, user, MANUFACTURER_SETTINGS, cache,
		MANUFACTURER_DEFAULT_CATEGORY, tiles, false, true);
		MANUFACTURER_DEFAULT_CATEGORY, tiles, false);
		}
		if (setup) {
		getTilesForAction(context, user, EXTRA_SETTINGS_ACTION, cache, null, tiles, false);
		@@ -256,30 +253,15 @@ public class TileUtils {
		return categories;
		}

		private static void getTilesForAction(Context context,
		UserHandle user, String action, Map<Pair<String, String>, Tile> addedCache,
		String defaultCategory, ArrayList<Tile> outTiles, boolean requireSettings) {
		getTilesForAction(context, user, action, addedCache, defaultCategory, outTiles,
		requireSettings, requireSettings);
		}

		private static void getTilesForAction(Context context,
		@VisibleForTesting
		static void getTilesForAction(Context context,
		UserHandle user, String action, Map<Pair<String, String>, Tile> addedCache,
		String defaultCategory, ArrayList<Tile> outTiles, boolean requireSettings,
		boolean usePriority) {
		Intent intent = new Intent(action);
		String defaultCategory, List<Tile> outTiles, boolean requireSettings) {
		final Intent intent = new Intent(action);
		if (requireSettings) {
		intent.setPackage(SETTING_PKG);
		}
		getTilesForIntent(context, user, intent, addedCache, defaultCategory, outTiles,
		usePriority);
		}

		public static void getTilesForIntent(
		Context context, UserHandle user, Intent intent,
		Map<Pair<String, String>, Tile> addedCache, String defaultCategory, List<Tile> outTiles,
		boolean usePriority) {
		PackageManager pm = context.getPackageManager();
		final PackageManager pm = context.getPackageManager();
		List<ResolveInfo> results = pm.queryIntentActivitiesAsUser(intent,
		PackageManager.GET_META_DATA, user.getIdentifier());
		for (ResolveInfo resolved : results) {
		@@ -306,7 +288,6 @@ public class TileUtils {
		Tile tile = addedCache.get(key);
		if (tile == null) {
		tile = new Tile(activityInfo, categoryKey);
		updateTileData(context, tile, activityInfo, activityInfo.applicationInfo, pm);
		addedCache.put(key, tile);
		}

		@@ -319,34 +300,6 @@ public class TileUtils {
		}
		}

		private static boolean updateTileData(Context context, Tile tile,
		ActivityInfo activityInfo, ApplicationInfo applicationInfo, PackageManager pm) {
		if (applicationInfo.isSystemApp()) {
		String summary = null;

		// Get the activity's meta-data
		try {
		Resources res = pm.getResourcesForApplication(applicationInfo.packageName);
		Bundle metaData = activityInfo.metaData;

		if (res != null && metaData != null) {
		if (metaData.containsKey(META_DATA_PREFERENCE_SUMMARY)) {
		if (metaData.get(META_DATA_PREFERENCE_SUMMARY) instanceof Integer) {
		summary = res.getString(metaData.getInt(META_DATA_PREFERENCE_SUMMARY));
		} else {
		summary = metaData.getString(META_DATA_PREFERENCE_SUMMARY);
		}
		}
		}
		} catch (PackageManager.NameNotFoundException \| Resources.NotFoundException e) {
		if (DEBUG) Log.d(LOG_TAG, "Couldn't find info", e);
		}
		return true;
		}

		return false;
		}

		/**
		* Gets the icon package name and resource id from content provider.
		*

packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java

+22 −28

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.settingslib.drawer;

		import static com.android.settingslib.drawer.TileUtils.IA_SETTINGS_ACTION;
		import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_ICON;
		import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_ICON_URI;
		import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_KEYHINT;
		@@ -24,6 +25,7 @@ import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMM

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.ArgumentMatchers.anyString;
		import static org.mockito.ArgumentMatchers.argThat;
		@@ -98,15 +100,14 @@ public class TileUtilsTest {
		@Test
		public void getTilesForIntent_shouldParseCategory() {
		final String testCategory = "category1";
		Intent intent = new Intent();
		Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>();
		List<Tile> outTiles = new ArrayList<>();
		List<ResolveInfo> info = new ArrayList<>();
		info.add(newInfo(true, testCategory));
		when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt()))
		when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
		.thenReturn(info);

		TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache,
		TileUtils.getTilesForAction(mContext, UserHandle.CURRENT, IA_SETTINGS_ACTION, addedCache,
		null /* defaultCategory /, outTiles, false / usePriority */);

		assertThat(outTiles.size()).isEqualTo(1);
		@@ -116,39 +117,37 @@ public class TileUtilsTest {
		@Test
		public void getTilesForIntent_shouldParseKeyHintForSystemApp() {
		String keyHint = "key";
		Intent intent = new Intent();
		Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>();
		List<Tile> outTiles = new ArrayList<>();
		List<ResolveInfo> info = new ArrayList<>();
		ResolveInfo resolveInfo = newInfo(true, null /* category */, keyHint);
		info.add(resolveInfo);

		when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt()))
		when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
		.thenReturn(info);

		TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache,
		null /* defaultCategory /, outTiles, false / usePriority */);
		TileUtils.getTilesForAction(mContext, UserHandle.CURRENT, IA_SETTINGS_ACTION, addedCache,
		null /* defaultCategory /, outTiles, false / requiresSettings */);

		assertThat(outTiles.size()).isEqualTo(1);
		assertThat(outTiles).hasSize(1);
		assertThat(outTiles.get(0).getKey(mContext)).isEqualTo(keyHint);
		}

		@Test
		public void getTilesForIntent_shouldSkipNonSystemApp() {
		final String testCategory = "category1";
		Intent intent = new Intent();
		Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>();
		List<Tile> outTiles = new ArrayList<>();
		List<ResolveInfo> info = new ArrayList<>();
		info.add(newInfo(false, testCategory));

		when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt()))
		when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
		.thenReturn(info);

		TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache,
		null /* defaultCategory /, outTiles, false / usePriority */);
		TileUtils.getTilesForAction(mContext, UserHandle.CURRENT, IA_SETTINGS_ACTION,
		addedCache, null /* defaultCategory /, outTiles, false / requiresSettings */);

		assertThat(outTiles.isEmpty()).isTrue();
		assertThat(outTiles).isEmpty();
		}

		@Test
		@@ -172,7 +171,6 @@ public class TileUtilsTest {

		@Test
		public void getTilesForIntent_shouldReadMetadataTitleAsString() {
		Intent intent = new Intent();
		Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>();
		List<Tile> outTiles = new ArrayList<>();
		List<ResolveInfo> info = new ArrayList<>();
		@@ -180,10 +178,10 @@ public class TileUtilsTest {
		URI_GET_SUMMARY, "my title", 0);
		info.add(resolveInfo);

		when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt()))
		when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
		.thenReturn(info);

		TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache,
		TileUtils.getTilesForAction(mContext, UserHandle.CURRENT, IA_SETTINGS_ACTION, addedCache,
		null /* defaultCategory /, outTiles, false / usePriority */);

		assertThat(outTiles.size()).isEqualTo(1);
		@@ -192,7 +190,6 @@ public class TileUtilsTest {

		@Test
		public void getTilesForIntent_shouldReadMetadataTitleFromResource() {
		Intent intent = new Intent();
		Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>();
		List<Tile> outTiles = new ArrayList<>();
		List<ResolveInfo> info = new ArrayList<>();
		@@ -200,13 +197,13 @@ public class TileUtilsTest {
		URI_GET_SUMMARY, null, 123);
		info.add(resolveInfo);

		when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt()))
		when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
		.thenReturn(info);

		when(mResources.getString(eq(123)))
		.thenReturn("my localized title");

		TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache,
		TileUtils.getTilesForAction(mContext, UserHandle.CURRENT, IA_SETTINGS_ACTION, addedCache,
		null /* defaultCategory /, outTiles, false / usePriority */);
		assertThat(outTiles.size()).isEqualTo(1);
		assertThat(outTiles.get(0).getTitle(mContext)).isEqualTo("my localized title");
		@@ -218,7 +215,6 @@ public class TileUtilsTest {

		@Test
		public void getTilesForIntent_shouldNotTintIconIfInSettingsPackage() {
		Intent intent = new Intent();
		Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>();
		List<Tile> outTiles = new ArrayList<>();
		List<ResolveInfo> info = new ArrayList<>();
		@@ -228,10 +224,10 @@ public class TileUtilsTest {
		resolveInfo.activityInfo.applicationInfo.packageName = "com.android.settings";
		info.add(resolveInfo);

		when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt()))
		when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
		.thenReturn(info);

		TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache,
		TileUtils.getTilesForAction(mContext, UserHandle.CURRENT, IA_SETTINGS_ACTION, addedCache,
		null /* defaultCategory /, outTiles, false / usePriority */);

		assertThat(outTiles.get(0).isIconTintable(mContext)).isFalse();
		@@ -239,7 +235,6 @@ public class TileUtilsTest {

		@Test
		public void getTilesForIntent_shouldMarkIconTintableIfMetadataSet() {
		Intent intent = new Intent();
		Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>();
		List<Tile> outTiles = new ArrayList<>();
		List<ResolveInfo> info = new ArrayList<>();
		@@ -249,10 +244,10 @@ public class TileUtilsTest {
		.putBoolean(TileUtils.META_DATA_PREFERENCE_ICON_TINTABLE, true);
		info.add(resolveInfo);

		when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt()))
		when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
		.thenReturn(info);

		TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache,
		TileUtils.getTilesForAction(mContext, UserHandle.CURRENT, IA_SETTINGS_ACTION, addedCache,
		null /* defaultCategory /, outTiles, false / usePriority */);

		assertThat(outTiles.get(0).isIconTintable(mContext)).isTrue();
		@@ -260,7 +255,6 @@ public class TileUtilsTest {

		@Test
		public void getTilesForIntent_shouldProcessUriContentForSystemApp() {
		Intent intent = new Intent();
		Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>();
		List<Tile> outTiles = new ArrayList<>();
		List<ResolveInfo> info = new ArrayList<>();
		@@ -268,10 +262,10 @@ public class TileUtilsTest {
		URI_GET_SUMMARY);
		info.add(resolveInfo);

		when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt()))
		when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
		.thenReturn(info);

		TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache,
		TileUtils.getTilesForAction(mContext, UserHandle.CURRENT, IA_SETTINGS_ACTION, addedCache,
		null /* defaultCategory /, outTiles, false / usePriority */);

		assertThat(outTiles.size()).isEqualTo(1);