Snap for 9625236 from 2e28f315cf1b0c828b99f1e8e130db956aad1b4f to tm-qpr3-release (55678556) · Commits · e / os / android_frameworks_libs_systemui

iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java

+26 −5

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ import android.os.Handler;
		import android.os.LocaleList;
		import android.os.Looper;
		import android.os.Process;
		import android.os.SystemClock;
		import android.os.Trace;
		import android.os.UserHandle;
		import android.text.TextUtils;
		@@ -79,6 +80,8 @@ public abstract class BaseIconCache {
		private static final boolean DEBUG = false;

		private static final int INITIAL_ICON_CACHE_CAPACITY = 50;
		// A format string which returns the original string as is.
		private static final String IDENTITY_FORMAT_STRING = "%1$s";

		// Empty class name is used for storing package default entry.
		public static final String EMPTY_CLASS_NAME = ".";
		@@ -122,6 +125,8 @@ public abstract class BaseIconCache {
		@NonNull
		private final SparseArray<FlagOp> mUserFlagOpMap = new SparseArray<>();

		private final SparseArray<String> mUserFormatString = new SparseArray<>();

		@Nullable
		private final String mDbFileName;

		@@ -268,6 +273,7 @@ public abstract class BaseIconCache {
		private void updateSystemState() {
		mLocaleList = mContext.getResources().getConfiguration().getLocales();
		mSystemState = mLocaleList.toLanguageTags() + "," + Build.VERSION.SDK_INT;
		mUserFormatString.clear();
		}

		@NonNull
		@@ -275,6 +281,22 @@ public abstract class BaseIconCache {
		return mSystemState;
		}

		public CharSequence getUserBadgedLabel(CharSequence label, UserHandle user) {
		int key = user.hashCode();
		int index = mUserFormatString.indexOfKey(key);
		String format;
		if (index < 0) {
		format = mPackageManager.getUserBadgedLabel(IDENTITY_FORMAT_STRING, user).toString();
		if (TextUtils.equals(IDENTITY_FORMAT_STRING, format)) {
		format = null;
		}
		mUserFormatString.put(key, format);
		} else {
		format = mUserFormatString.valueAt(index);
		}
		return format == null ? label : String.format(format, label);
		}

		/**
		* Adds an entry into the DB and the in-memory cache.
		* @param replaceExisting if true, it will recreate the bitmap even if it already exists in
		@@ -313,7 +335,7 @@ public abstract class BaseIconCache {
		}
		entry.title = entryTitle;

		entry.contentDescription = mPackageManager.getUserBadgedLabel(entry.title, user);
		entry.contentDescription = getUserBadgedLabel(entry.title, user);
		if (cachingLogic.addToMemCache()) mCache.put(key, entry);

		ContentValues values = newContentValues(entry.bitmap, entry.title.toString(),
		@@ -468,7 +490,7 @@ public abstract class BaseIconCache {
		@NonNull final T object, @NonNull final CacheEntry entry,
		@NonNull final CachingLogic<T> cachingLogic, @NonNull final UserHandle user) {
		entry.title = cachingLogic.getLabel(object);
		entry.contentDescription = mPackageManager.getUserBadgedLabel(
		entry.contentDescription = getUserBadgedLabel(
		cachingLogic.getDescription(object, entry.title), user);
		}

		@@ -549,7 +571,7 @@ public abstract class BaseIconCache {
		li.close();

		entry.title = appInfo.loadLabel(mPackageManager);
		entry.contentDescription = mPackageManager.getUserBadgedLabel(entry.title, user);
		entry.contentDescription = getUserBadgedLabel(entry.title, user);
		entry.bitmap = BitmapInfo.of(
		useLowResIcon ? LOW_RES_ICON : iconInfo.icon, iconInfo.color);

		@@ -610,8 +632,7 @@ public abstract class BaseIconCache {
		entry.title = "";
		entry.contentDescription = "";
		} else {
		entry.contentDescription = mPackageManager.getUserBadgedLabel(
		entry.title, cacheKey.user);
		entry.contentDescription = getUserBadgedLabel(entry.title, cacheKey.user);
		}

		if (!lowRes) {

searchuilib/src/com/android/app/search/SearchActionExtras.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -32,10 +32,8 @@ public class SearchActionExtras {
		public static final String BUNDLE_EXTRA_ICON_CACHE_KEY = "icon_cache_key";
		public static final String BUNDLE_EXTRA_SHOULD_START = "should_start";
		public static final String BUNDLE_EXTRA_SHOULD_START_FOR_RESULT = "should_start_for_result";
		public static final String BUNDLE_EXTRA_SUGGEST_OPEN_DEFAULT_BROWSER =
		"suggest_open_default_browser";
		public static final String BUNDLE_EXTRA_TRAMPOLINE_ACTIVITY_ENABLED =
		"trampoline_activity_enabled";
		public static final String BUNDLE_EXTRA_SUGGESTION_ACTION_TEXT = "suggestion_action_text";
		public static final String BUNDLE_EXTRA_SUGGESTION_ACTION_RPC = "suggestion_action_rpc";
		public static final String BUNDLE_EXTRA_SKIP_LOGGING_IN_TARGET_HANDLER =
		"skip_logging_in_target_handler";
		}