diff options
Diffstat (limited to 'src')
3 files changed, 19 insertions, 9 deletions
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index cc9bda710..7bdbb95f7 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -69,6 +69,7 @@ import com.android.launcher3.compat.ShortcutConfigActivityInfo; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dragndrop.FolderAdaptiveIcon; import com.android.launcher3.graphics.RotationMode; +import com.android.launcher3.graphics.TintedDrawableSpan; import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.shortcuts.ShortcutKey; @@ -562,6 +563,20 @@ public final class Utilities { return spanned; } + /** + * Prefixes a text with the provided icon + */ + public static CharSequence prefixTextWithIcon(Context context, int iconRes, CharSequence msg) { + // Update the hint to contain the icon. + // Prefix the original hint with two spaces. The first space gets replaced by the icon + // using span. The second space is used for a singe space character between the hint + // and the icon. + SpannableString spanned = new SpannableString(" " + msg); + spanned.setSpan(new TintedDrawableSpan(context, iconRes), + 0, 1, Spannable.SPAN_EXCLUSIVE_INCLUSIVE); + return spanned; + } + public static SharedPreferences getPrefs(Context context) { return context.getSharedPreferences( LauncherFiles.SHARED_PREFERENCES_KEY, Context.MODE_PRIVATE); diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java index 1ff484b49..31fcc8c64 100644 --- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java +++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java @@ -20,6 +20,7 @@ import static android.view.View.MeasureSpec.getSize; import static android.view.View.MeasureSpec.makeMeasureSpec; import static com.android.launcher3.LauncherState.ALL_APPS_HEADER; +import static com.android.launcher3.Utilities.prefixTextWithIcon; import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR; import android.content.Context; @@ -40,6 +41,7 @@ import com.android.launcher3.ExtendedEditText; import com.android.launcher3.Insettable; import com.android.launcher3.Launcher; import com.android.launcher3.R; +import com.android.launcher3.Utilities; import com.android.launcher3.allapps.AllAppsContainerView; import com.android.launcher3.allapps.AllAppsStore; import com.android.launcher3.allapps.AlphabeticalAppsList; @@ -89,14 +91,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText mFixedTranslationY = getTranslationY(); mMarginTopAdjusting = mFixedTranslationY - getPaddingTop(); - // Update the hint to contain the icon. - // Prefix the original hint with two spaces. The first space gets replaced by the icon - // using span. The second space is used for a singe space character between the hint - // and the icon. - SpannableString spanned = new SpannableString(" " + getHint()); - spanned.setSpan(new TintedDrawableSpan(getContext(), R.drawable.ic_allapps_search), - 0, 1, Spannable.SPAN_EXCLUSIVE_INCLUSIVE); - setHint(spanned); + setHint(prefixTextWithIcon(getContext(), R.drawable.ic_allapps_search, getHint())); } @Override diff --git a/src/com/android/launcher3/graphics/TintedDrawableSpan.java b/src/com/android/launcher3/graphics/TintedDrawableSpan.java index d7195750d..0bfc435cc 100644 --- a/src/com/android/launcher3/graphics/TintedDrawableSpan.java +++ b/src/com/android/launcher3/graphics/TintedDrawableSpan.java @@ -32,7 +32,7 @@ public class TintedDrawableSpan extends DynamicDrawableSpan { public TintedDrawableSpan(Context context, int resourceId) { super(ALIGN_BOTTOM); - mDrawable = context.getDrawable(resourceId); + mDrawable = context.getDrawable(resourceId).mutate(); mOldTint = 0; mDrawable.setTint(0); } |