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

Commit 5787a271 authored by Brandon Dayauon's avatar Brandon Dayauon
Browse files

Add home settings toggle featureflag for enablingTwoLineText 

- Have shouldUseTwoLine() be decided with the home settings toggle value

bug:316027081
spec: https://www.figma.com/file/uMzPkNMZpb7EyfHDo8usIa/V-%E2%80%A2-Toast-Butter?type=design&node-id=405-384593&mode=design&t=UBkdeuNlAdRh2FGU-0
Test:
Video: https://drive.google.com/file/d/15VUhNVro2fiwv3SzMda1StiPb3PV1eMT/view?usp=sharing
before searchPreferenceScreen: https://screenshot.googleplex.com/3uqdMsZoGSBYb6c
after searchPreferenceScreen: https://drive.google.com/file/d/15dswiHRTnafyhgQA_tL2tRc7vHFWdHbZ/view?usp=sharing
before homeSettingsPage: https://screenshot.googleplex.com/7wsNevxGun2KCCB
after homeSettingsPage: https://drive.google.com/file/d/15m5bjEyewlNHI_h26aygHa7zrgZ5qDF6/view?usp=sharing
AppListSettingsPage: https://drive.google.com/file/d/15hl4ScHBOLgKv3M38HtatMxQw85pgl7t/view?usp=sharing
Flag: enableTwolineToggle DEVELOPMENT

Change-Id: I3ad133dd51dcb97e14ccded730e7737c5049261a
parent 0f1c6ded

aconfig/launcher.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ flag { 
    bug: "270390937"

}



flag {

    name: "enable_twoline_toggle"

    namespace: "launcher"

    description: "Enables visibility in home settings to see the toggle to turn on/off two lines in all apps."

    bug: "316027081"

}



flag {

    name: "enable_grid_only_overview"

    namespace: "launcher"

quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java

+4 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.launcher3.BubbleTextView; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;

import com.android.launcher3.Flags;

import com.android.launcher3.LauncherPrefs;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.FloatingHeaderRow;
@@ -137,7 +138,9 @@ public class PredictionRowView<T extends Context & ActivityContext> 
        int totalHeight = iconHeight + iconPadding + textHeight + mVerticalPadding * 2;

        // Prediction row height will be 4dp bigger than the regular apps in A-Z list when two line

        // is not enabled. Otherwise, the extra height will increase by just the textHeight.

        int extraHeight = FeatureFlags.enableTwolineAllapps() ? textHeight : mTopRowExtraHeight;

        int extraHeight = (FeatureFlags.enableTwolineAllapps() && (!Flags.enableTwolineToggle()

                || (Flags.enableTwolineToggle() && LauncherPrefs.ENABLE_TWOLINE_ALLAPPS_TOGGLE.get(

                        getContext())))) ? textHeight : mTopRowExtraHeight;

        totalHeight += extraHeight;

        return getVisibility() == GONE ? 0 : totalHeight + getPaddingTop() + getPaddingBottom();

    }

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 


            // Update icon size

            deviceProfile.iconSizePx = deviceProfile.taskbarIconSize;

            deviceProfile.updateIconSize(1f, getResources());

            deviceProfile.updateIconSize(1f, this);

        };

        mDeviceProfile = originDeviceProfile.toBuilder(this)

                .withDimensionsOverride(overrideProvider).build();

src/com/android/launcher3/BubbleTextView.java

+4 −2
Original line number Diff line number Diff line
@@ -422,8 +422,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() {

src/com/android/launcher3/DeviceProfile.java

+10 −8
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ public class DeviceProfile { 
        }



        // Calculate all of the remaining variables.

        extraSpace = updateAvailableDimensions(res);

        extraSpace = updateAvailableDimensions(context);



        calculateAndSetWorkspaceVerticalPadding(context, inv, extraSpace);
@@ -1006,14 +1006,14 @@ public class DeviceProfile { 
    /**

     * Returns the amount of extra (or unused) vertical space.

     */

    private int updateAvailableDimensions(Resources res) {

    private int updateAvailableDimensions(Context context) {

        iconCenterVertically = (mIsScalableGrid || mIsResponsiveGrid) && isVerticalBarLayout();



        if (mIsResponsiveGrid) {

            iconSizePx = mResponsiveWorkspaceCellSpec.getIconSize();

            iconTextSizePx = mResponsiveWorkspaceCellSpec.getIconTextSize();

            mIconDrawablePaddingOriginalPx = mResponsiveWorkspaceCellSpec.getIconDrawablePadding();

            updateIconSize(1f, res);

            updateIconSize(1f, context);

            updateWorkspacePadding();

            return 0;

        }
@@ -1023,7 +1023,7 @@ public class DeviceProfile { 
        iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics));

        iconTextSizePx = pxFromSp(invIconTextSizeSp, mMetrics);



        updateIconSize(1f, res);

        updateIconSize(1f, context);

        updateWorkspacePadding();



        // Check to see if the icons fit within the available height.
@@ -1047,7 +1047,7 @@ public class DeviceProfile { 


        if (shouldScale) {

            float scale = Math.min(scaleX, scaleY);

            updateIconSize(scale, res);

            updateIconSize(scale, context);

            extraHeight = Math.max(0, maxHeight - getCellLayoutHeightSpecification());

        }
@@ -1093,7 +1093,7 @@ public class DeviceProfile { 
     * iconTextSizePx, iconDrawablePaddingPx, cellWidth/Height, allApps* variants,

     * hotseat sizes, workspaceSpringLoadedShrinkFactor, folderIconSizePx, and folderIconOffsetYPx.

     */

    public void updateIconSize(float scale, Resources res) {

    public void updateIconSize(float scale, Context context) {

        // Icon scale should never exceed 1, otherwise pixellation may occur.

        iconScale = Math.min(1f, scale);

        cellScaleToFit = scale;
@@ -1213,13 +1213,15 @@ public class DeviceProfile { 
        if (mIsResponsiveGrid) {

            updateAllAppsWithResponsiveMeasures();

        } else {

            updateAllAppsIconSize(scale, res);

            updateAllAppsIconSize(scale, context.getResources());

        }

        updateAllAppsContainerWidth();

        if (isVerticalLayout && !mIsResponsiveGrid) {

            hideWorkspaceLabelsIfNotEnoughSpace();

        }

        if (FeatureFlags.enableTwolineAllapps()) {

        if (FeatureFlags.enableTwolineAllapps()

                && (!Flags.enableTwolineToggle() || (Flags.enableTwolineToggle()

                && LauncherPrefs.ENABLE_TWOLINE_ALLAPPS_TOGGLE.get(context)))) {

            // Add extra textHeight to the existing allAppsCellHeight.

            allAppsCellHeightPx += Utilities.calculateTextHeight(allAppsIconTextSizePx);

        }