Disable two line text legacy flag.
Will now repurpose the twolinetoggle flag to be the flag that will make twoline text enabled/disabled. bug: 316027081 Test: presubmit manually: https://screenshot.googleplex.com/BsZGCm7DrTZLwG4 Flag: com.android.launcher3.enable_twoline_toggle Staging (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:68c18236adb5d49d5ba3c5a19187759af63a53b4) Merged-In: Idef427bad6551ae56b13e35393e076b8e000af5a Change-Id: Idef427bad6551ae56b13e35393e076b8e000af5a
This commit is contained in:
1 parent
a72f546582
commit
00bd00fd4e
7 files changed
+147
-197
No files matched your search
@@ -1233,9 +1233,8 @@ public class DeviceProfile {
|
||||
if (isVerticalLayout && !mIsResponsiveGrid) {
|
||||
hideWorkspaceLabelsIfNotEnoughSpace();
|
||||
}
|
||||
if (FeatureFlags.enableTwolineAllapps()
|
||||
&& (!Flags.enableTwolineToggle() || (Flags.enableTwolineToggle()
|
||||
&& LauncherPrefs.ENABLE_TWOLINE_ALLAPPS_TOGGLE.get(context)))) {
|
||||
if ((Flags.enableTwolineToggle()
|
||||
&& LauncherPrefs.ENABLE_TWOLINE_ALLAPPS_TOGGLE.get(context))) {
|
||||
// Add extra textHeight to the existing allAppsCellHeight.
|
||||
allAppsCellHeightPx += Utilities.calculateTextHeight(allAppsIconTextSizePx);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user