aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 16:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add home settings toggle featureflag for enablingTwoLineText" into main

Browse Source
This commit is contained in:
Brandon Dayauon
2024-02-21 18:14:21 +00:00
committed by Android (Google) Code Review
parent ef4b102a08 5787a2710c
commit 0fa9113028
7 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/BubbleTextView.java
View File

@@ -428,8 +428,10 @@ 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() && isCurrentLanguageEnglish())
&& (mDisplay == DISPLAY_ALL_APPS || mDisplay == DISPLAY_PREDICTION_ROW);
return FeatureFlags.enableTwolineAllapps() && isCurrentLanguageEnglish()
&& (mDisplay == DISPLAY_ALL_APPS || mDisplay == DISPLAY_PREDICTION_ROW)
&& (!Flags.enableTwolineToggle() || (Flags.enableTwolineToggle()
&& LauncherPrefs.ENABLE_TWOLINE_ALLAPPS_TOGGLE.get(getContext())));
}
protected boolean isCurrentLanguageEnglish() {