Remove a bunch of unused things from Tile.
Bug: 77600770
Test: rebuild
Change-Id: I6e1bd6db80ea974e64b34cc80af9a409104c7092
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryManager.java b/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryManager.java
index 2bec1d7..95edc5e 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryManager.java
@@ -17,12 +17,13 @@
import android.content.ComponentName;
import android.content.Context;
-import androidx.annotation.VisibleForTesting;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Log;
import android.util.Pair;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settingslib.applications.InterestingConfigChanges;
import java.util.ArrayList;
@@ -32,10 +33,10 @@
import java.util.Map.Entry;
import java.util.Set;
-import static java.lang.String.CASE_INSENSITIVE_ORDER;
-
public class CategoryManager {
+ public static final String SETTING_PKG = "com.android.settings";
+
private static final String TAG = "CategoryManager";
private static CategoryManager sInstance;
@@ -70,22 +71,13 @@
}
public synchronized DashboardCategory getTilesByCategory(Context context, String categoryKey) {
- return getTilesByCategory(context, categoryKey, TileUtils.SETTING_PKG);
- }
-
- public synchronized DashboardCategory getTilesByCategory(Context context, String categoryKey,
- String settingPkg) {
- tryInitCategories(context, settingPkg);
+ tryInitCategories(context, SETTING_PKG);
return mCategoryByKeyMap.get(categoryKey);
}
public synchronized List<DashboardCategory> getCategories(Context context) {
- return getCategories(context, TileUtils.SETTING_PKG);
- }
-
- public synchronized List<DashboardCategory> getCategories(Context context, String settingPkg) {
- tryInitCategories(context, settingPkg);
+ tryInitCategories(context, SETTING_PKG);
return mCategories;
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/Tile.java b/packages/SettingsLib/src/com/android/settingslib/drawer/Tile.java
index b55d2ef..0c802af 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/Tile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/Tile.java
@@ -95,11 +95,6 @@
*/
public String key;
- /**
- * Optional remote view which will be displayed instead of the regular title-summary item.
- */
- public RemoteViews remoteViews;
-
public Tile() {
// Empty
}
@@ -135,7 +130,6 @@
dest.writeInt(priority);
dest.writeBundle(metaData);
dest.writeString(key);
- dest.writeParcelable(remoteViews, flags);
dest.writeBoolean(isIconTintable);
}
@@ -157,7 +151,6 @@
priority = in.readInt();
metaData = in.readBundle();
key = in.readString();
- remoteViews = in.readParcelable(RemoteViews.class.getClassLoader());
isIconTintable = in.readBoolean();
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
index 76f24bc..f54ba8c 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
@@ -166,8 +166,6 @@
public static final String META_DATA_PREFERENCE_SUMMARY_URI =
"com.android.settings.summary_uri";
- public static final String SETTING_PKG = "com.android.settings";
-
/**
* Value for {@link #META_DATA_KEY_PROFILE}. When the device has a managed profile,
* the app will always be run in the primary profile.
@@ -280,15 +278,6 @@
Context context, UserHandle user, Intent intent,
Map<Pair<String, String>, Tile> addedCache, String defaultCategory, List<Tile> outTiles,
boolean usePriority, boolean checkCategory, boolean forceTintExternalIcon) {
- getTilesForIntent(context, user, intent, addedCache, defaultCategory, outTiles,
- usePriority, checkCategory, forceTintExternalIcon, false /* shouldUpdateTiles */);
- }
-
- public static void getTilesForIntent(
- Context context, UserHandle user, Intent intent,
- Map<Pair<String, String>, Tile> addedCache, String defaultCategory, List<Tile> outTiles,
- boolean usePriority, boolean checkCategory, boolean forceTintExternalIcon,
- boolean shouldUpdateTiles) {
PackageManager pm = context.getPackageManager();
List<ResolveInfo> results = pm.queryIntentActivitiesAsUser(intent,
PackageManager.GET_META_DATA, user.getIdentifier());
@@ -313,8 +302,7 @@
categoryKey = metaData.getString(EXTRA_CATEGORY_KEY);
}
- Pair<String, String> key = new Pair<String, String>(activityInfo.packageName,
- activityInfo.name);
+ Pair<String, String> key = new Pair<>(activityInfo.packageName, activityInfo.name);
Tile tile = addedCache.get(key);
if (tile == null) {
tile = new Tile();
@@ -327,8 +315,6 @@
pm, providerMap, forceTintExternalIcon);
if (DEBUG) Log.d(LOG_TAG, "Adding tile " + tile.title);
addedCache.put(key, tile);
- } else if (shouldUpdateTiles) {
- updateSummaryAndTitle(context, providerMap, tile);
}
if (!tile.userHandle.contains(user)) {
@@ -435,26 +421,6 @@
return false;
}
- private static void updateSummaryAndTitle(
- Context context, Map<String, IContentProvider> providerMap, Tile tile) {
- if (tile == null || tile.metaData == null
- || !tile.metaData.containsKey(META_DATA_PREFERENCE_SUMMARY_URI)) {
- return;
- }
-
- String uriString = tile.metaData.getString(META_DATA_PREFERENCE_SUMMARY_URI);
- Bundle bundle = getBundleFromUri(context, uriString, providerMap);
- String overrideSummary = getString(bundle, META_DATA_PREFERENCE_SUMMARY);
- String overrideTitle = getString(bundle, META_DATA_PREFERENCE_TITLE);
- if (overrideSummary != null) {
- tile.remoteViews.setTextViewText(android.R.id.summary, overrideSummary);
- }
-
- if (overrideTitle != null) {
- tile.remoteViews.setTextViewText(android.R.id.title, overrideTitle);
- }
- }
-
/**
* Gets the icon package name and resource id from content provider.
* @param context context
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java
index 605c861..c495511 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java
@@ -20,13 +20,15 @@
import android.util.ArraySet;
+import com.android.settingslib.SettingsLibRobolectricTestRunner;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import java.util.Set;
-@RunWith(RobolectricTestRunner.class)
+@RunWith(SettingsLibRobolectricTestRunner.class)
public class CategoryKeyTest {
@Test
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java
index 996a122..5d352f0 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java
@@ -7,12 +7,15 @@
import static com.android.settingslib.drawer.TileUtils.PROFILE_PRIMARY;
import android.os.Bundle;
+
+import com.android.settingslib.SettingsLibRobolectricTestRunner;
+
import org.junit.Before;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.junit.Test;
-@RunWith(RobolectricTestRunner.class)
+@RunWith(SettingsLibRobolectricTestRunner.class)
public class TileTest {
private Tile mTile;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java
index 9df4318..31621af 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java
@@ -178,7 +178,7 @@
.thenReturn(info);
List<DashboardCategory> categoryList = TileUtils.getCategories(
- mContext, cache, testAction, TileUtils.SETTING_PKG);
+ mContext, cache, testAction, CategoryManager.SETTING_PKG);
assertThat(categoryList.get(0).getTile(0).category).isEqualTo(testCategory);
}
@@ -193,12 +193,12 @@
userHandleList.add(new UserHandle(ActivityManager.getCurrentUser()));
when(mUserManager.getUserProfiles()).thenReturn(userHandleList);
- TileUtils.getCategories(mContext, cache, null /* action */, TileUtils.SETTING_PKG);
+ TileUtils.getCategories(mContext, cache, null /* action */, CategoryManager.SETTING_PKG);
verify(mPackageManager, atLeastOnce()).queryIntentActivitiesAsUser(
intentCaptor.capture(), anyInt(), anyInt());
assertThat(intentCaptor.getAllValues().get(0).getPackage())
- .isEqualTo(TileUtils.SETTING_PKG);
+ .isEqualTo(CategoryManager.SETTING_PKG);
}
@Test