Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7396c92 authored by Brandon Dayauon's avatar Brandon Dayauon Committed by Android (Google) Code Review
Browse files

Merge "ENABLE_TWOLINE_ALLAPPS to true" into main

parents 1eb8bd87 617db544

src/com/android/launcher3/config/FeatureFlags.java

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ public final class FeatureFlags { 


    // Aconfig migration complete for ENABLE_TWOLINE_ALLAPPS.

    public static final BooleanFlag ENABLE_TWOLINE_ALLAPPS = getDebugFlag(270390937,

            "ENABLE_TWOLINE_ALLAPPS", DISABLED, "Enables two line label inside all apps.");

            "ENABLE_TWOLINE_ALLAPPS", ENABLED, "Enables two line label inside all apps.");

    public static boolean enableTwolineAllapps() {

        return ENABLE_TWOLINE_ALLAPPS.get() || Flags.enableTwolineAllapps();

    }

tests/assets/dumpTests/DeviceProfileDumpTest/phonePortrait.txt

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ DeviceProfile: 
	allAppsIconSizePx: 147.0px (56.0dp)

	allAppsIconTextSizePx: 38.0px (14.476191dp)

	allAppsIconDrawablePaddingPx: 21.0px (8.0dp)

	allAppsCellHeightPx: 315.0px (120.0dp)

	allAppsCellHeightPx: 366.0px (139.42857dp)

	allAppsCellWidthPx: 189.0px (72.0dp)

	allAppsBorderSpacePxX: 42.0px (16.0dp)

	allAppsBorderSpacePxY: 42.0px (16.0dp)

tests/assets/dumpTests/DeviceProfileDumpTest/phonePortrait3Button.txt

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ DeviceProfile: 
	allAppsIconSizePx: 147.0px (56.0dp)

	allAppsIconTextSizePx: 38.0px (14.476191dp)

	allAppsIconDrawablePaddingPx: 21.0px (8.0dp)

	allAppsCellHeightPx: 315.0px (120.0dp)

	allAppsCellHeightPx: 366.0px (139.42857dp)

	allAppsCellWidthPx: 189.0px (72.0dp)

	allAppsBorderSpacePxX: 42.0px (16.0dp)

	allAppsBorderSpacePxY: 42.0px (16.0dp)

tests/assets/dumpTests/DeviceProfileDumpTest/phoneVerticalBar.txt

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ DeviceProfile: 
	allAppsIconSizePx: 147.0px (56.0dp)

	allAppsIconTextSizePx: 38.0px (14.476191dp)

	allAppsIconDrawablePaddingPx: 21.0px (8.0dp)

	allAppsCellHeightPx: 321.0px (122.28571dp)

	allAppsCellHeightPx: 372.0px (141.71428dp)

	allAppsCellWidthPx: 189.0px (72.0dp)

	allAppsBorderSpacePxX: 42.0px (16.0dp)

	allAppsBorderSpacePxY: 42.0px (16.0dp)

tests/assets/dumpTests/DeviceProfileDumpTest/phoneVerticalBar3Button.txt

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ DeviceProfile: 
	allAppsIconSizePx: 147.0px (56.0dp)

	allAppsIconTextSizePx: 38.0px (14.476191dp)

	allAppsIconDrawablePaddingPx: 21.0px (8.0dp)

	allAppsCellHeightPx: 321.0px (122.28571dp)

	allAppsCellHeightPx: 372.0px (141.71428dp)

	allAppsCellWidthPx: 189.0px (72.0dp)

	allAppsBorderSpacePxX: 42.0px (16.0dp)

	allAppsBorderSpacePxY: 42.0px (16.0dp)