From 7891425109dcff1002ff25dd5c7d4aaeefee781d Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Mon, 29 Jan 2024 11:18:03 -0800 Subject: [PATCH] Cleaning up release flag: ENABLE_ICON_LABEL_AUTO_SCALING Bug: 270393294 Flag: N/A Test: N/A Change-Id: Ied7e21150e8176f044615959d20e75bb1cad7dfa --- src/com/android/launcher3/BubbleTextView.java | 5 ----- src/com/android/launcher3/config/FeatureFlags.java | 4 ---- 2 files changed, 9 deletions(-) diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index ba65bea5b0..baa1ee38aa 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -19,7 +19,6 @@ package com.android.launcher3; import static android.text.Layout.Alignment.ALIGN_NORMAL; import static com.android.launcher3.Flags.enableCursorHoverStates; -import static com.android.launcher3.config.FeatureFlags.ENABLE_ICON_LABEL_AUTO_SCALING; import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon; import static com.android.launcher3.icons.BitmapInfo.FLAG_NO_BADGE; import static com.android.launcher3.icons.BitmapInfo.FLAG_SKIP_USER_BADGE; @@ -556,9 +555,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, } private void checkForEllipsis() { - if (!ENABLE_ICON_LABEL_AUTO_SCALING.get()) { - return; - } float width = getWidth() - getCompoundPaddingLeft() - getCompoundPaddingRight(); if (width <= 0) { return; @@ -830,7 +826,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, float currentWordWidth, runningWidth = 0; CharSequence currentWord; StringBuilder newString = new StringBuilder(); - // TODO: Remove when ENABLE_ICON_LABEL_AUTO_SCALING feature flag is being cleaned up. paint.setLetterSpacing(MIN_LETTER_SPACING); int stringPtr = 0; for (int i = 0; i < breakPoints.size()+1; i++) { diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 1994bd100a..3fd40210bd 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -413,10 +413,6 @@ public final class FeatureFlags { "ENABLE_ENFORCED_ROUNDED_CORNERS", ENABLED, "Enforce rounded corners on all App Widgets"); - public static final BooleanFlag ENABLE_ICON_LABEL_AUTO_SCALING = getDebugFlag(270393294, - "ENABLE_ICON_LABEL_AUTO_SCALING", ENABLED, - "Enables scaling/spacing for icon labels to make more characters visible"); - public static final BooleanFlag USE_LOCAL_ICON_OVERRIDES = getDebugFlag(270394973, "USE_LOCAL_ICON_OVERRIDES", ENABLED, "Use inbuilt monochrome icons if app doesn't provide one");