Merge "Make two line text support only for ENGLISH locale" into main (65eecc93) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/BubbleTextView.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -175,6 +175,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
		@ViewDebug.ExportedProperty(category = "launcher")
		private DotInfo mDotInfo;
		private DotRenderer mDotRenderer;
		private Locale mCurrentLocale;
		@ViewDebug.ExportedProperty(category = "launcher", deepExport = true)
		protected DotRenderer.DrawParams mDotParams;
		private Animator mDotScaleAnim;
		@@ -250,6 +251,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,

		mDotParams = new DotRenderer.DrawParams();

		mCurrentLocale = context.getResources().getConfiguration().locale;
		setEllipsize(TruncateAt.END);
		setAccessibilityDelegate(mActivity.getAccessibilityDelegate());
		setTextAlpha(1f);
		@@ -411,10 +413,12 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
		* Only if actual text can be displayed in two line, the {@code true} value will be effective.
		*/
		protected boolean shouldUseTwoLine() {
		return ((FeatureFlags.enableTwolineAllapps())
		&& (mDisplay == DISPLAY_ALL_APPS \|\| mDisplay == DISPLAY_PREDICTION_ROW))
		\|\| (FeatureFlags.ENABLE_TWOLINE_DEVICESEARCH.get()
		&& mDisplay == DISPLAY_SEARCH_RESULT);
		return (FeatureFlags.enableTwolineAllapps() && isCurrentLanguageEnglish())
		&& (mDisplay == DISPLAY_ALL_APPS \|\| mDisplay == DISPLAY_PREDICTION_ROW);
		}

		protected boolean isCurrentLanguageEnglish() {
		return mCurrentLocale.equals(Locale.US);
		}

		@UiThread