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

Commit 769fa534 authored by Federico Baron's avatar Federico Baron Committed by Android (Google) Code Review
Browse files

Merge "Cleanup LARGE_SCREEN_WIDGET_PICKER flag" into main

parents bf5757c3 2553ec02

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

+0 −5
Original line number Diff line number Diff line
@@ -154,11 +154,6 @@ public final class FeatureFlags { 


    public static final BooleanFlag SHOW_DOT_PAGINATION = getDebugFlag(270395278,

            "SHOW_DOT_PAGINATION", ENABLED, "Enable showing dot pagination in workspace");



    public static final BooleanFlag LARGE_SCREEN_WIDGET_PICKER = getDebugFlag(270395809,

            "LARGE_SCREEN_WIDGET_PICKER", ENABLED, "Enable new widget picker that takes "

                    + "advantage of large screen format");



    public static final BooleanFlag UNFOLDED_WIDGET_PICKER = getDebugFlag(301918659,

            "UNFOLDED_WIDGET_PICKER", DISABLED, "Enable new widget picker that takes "

                    + "advantage of the unfolded foldable format");

src/com/android/launcher3/widget/BaseWidgetSheet.java

+1 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
package com.android.launcher3.widget;



import static com.android.app.animation.Interpolators.EMPHASIZED;

import static com.android.launcher3.config.FeatureFlags.LARGE_SCREEN_WIDGET_PICKER;



import android.content.Context;

import android.graphics.Canvas;
@@ -194,9 +193,7 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView<Launcher> 
        int widthUsed;

        if (deviceProfile.isTablet) {

            int margin = deviceProfile.allAppsLeftRightMargin;

            if (deviceProfile.isLandscape

                    && LARGE_SCREEN_WIDGET_PICKER.get()

                    && !deviceProfile.isTwoPanels) {

            if (deviceProfile.isLandscape && !deviceProfile.isTwoPanels) {

                margin = getResources().getDimensionPixelSize(

                        R.dimen.widget_picker_landscape_tablet_left_right_margin);

            }

src/com/android/launcher3/widget/picker/WidgetsFullSheet.java

+2 −5
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.launcher3.widget.picker; 
import static android.view.View.MeasureSpec.makeMeasureSpec;



import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;

import static com.android.launcher3.config.FeatureFlags.LARGE_SCREEN_WIDGET_PICKER;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGETSTRAY_SEARCHED;

import static com.android.launcher3.testing.shared.TestProtocol.NORMAL_STATE_ORDINAL;
@@ -679,8 +678,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet 


    /** Shows the {@link WidgetsFullSheet} on the launcher. */

    public static WidgetsFullSheet show(Launcher launcher, boolean animate) {

        boolean isTwoPane = LARGE_SCREEN_WIDGET_PICKER.get()

                && launcher.getDeviceProfile().isTablet

        boolean isTwoPane = launcher.getDeviceProfile().isTablet

                && launcher.getDeviceProfile().isLandscape

                && (!launcher.getDeviceProfile().isTwoPanels

                    || FeatureFlags.UNFOLDED_WIDGET_PICKER.get());
@@ -798,8 +796,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet 
        // Checks the orientation of the screen

        if (mOrientation != newConfig.orientation) {

            mOrientation = newConfig.orientation;

            if (LARGE_SCREEN_WIDGET_PICKER.get()

                    && mDeviceProfile.isTablet && !mDeviceProfile.isTwoPanels) {

            if (mDeviceProfile.isTablet && !mDeviceProfile.isTwoPanels) {

                handleClose(false);

                show(Launcher.getLauncher(getContext()), false);

            } else {