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

Commit 9fc14b94 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ENABLE_WIDGET_PICKER_DEPTH" into tm-qpr-dev am: 01c1dff4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21539136



Change-Id: Ic134a1cd2780c2f2ff5f294f33a1f8367b3b6eb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0282b6f7 01c1dff4

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+1 −5
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import static com.android.launcher3.anim.Interpolators.EMPHASIZED; 
import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;

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

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

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

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

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

import static com.android.launcher3.model.data.ItemInfo.NO_MATCHING_ID;
@@ -169,7 +168,6 @@ import com.android.quickstep.views.FloatingTaskView; 
import com.android.quickstep.views.OverviewActionsView;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;

import com.android.systemui.shared.recents.model.Task;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.unfold.RemoteUnfoldSharedComponent;

import com.android.systemui.unfold.UnfoldSharedComponent;
@@ -187,7 +185,6 @@ import java.io.PrintWriter; 
import java.util.ArrayList;

import java.util.List;

import java.util.Objects;

import java.util.function.Consumer;

import java.util.function.Predicate;

import java.util.stream.Stream;
@@ -254,8 +251,7 @@ public class QuickstepLauncher extends Launcher { 
        mDesktopVisibilityController = new DesktopVisibilityController(this);

        mHotseatPredictionController = new HotseatPredictionController(this);



        mEnableWidgetDepth = ENABLE_WIDGET_PICKER_DEPTH.get()

                && SystemProperties.getBoolean("ro.launcher.depth.widget", true);

        mEnableWidgetDepth = SystemProperties.getBoolean("ro.launcher.depth.widget", true);

        getWorkspace().addOverlayCallback(progress ->

                onTaskbarInAppDisplayProgressUpdate(progress, MINUS_ONE_PAGE_PROGRESS_INDEX));

    }

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

+0 −3
Original line number Diff line number Diff line
@@ -283,9 +283,6 @@ public final class FeatureFlags { 
            "FOLDABLE_WORKSPACE_REORDER", true,

            "In foldables, when reordering the icons and widgets, is now going to use both sides");



    public static final BooleanFlag ENABLE_WIDGET_PICKER_DEPTH = new DeviceFlag(

            "ENABLE_WIDGET_PICKER_DEPTH", true, "Enable changing depth in widget picker.");



    public static final BooleanFlag ENABLE_MULTI_DISPLAY_PARTIAL_DEPTH = getDebugFlag(

            "ENABLE_MULTI_DISPLAY_PARTIAL_DEPTH", false,

            "Allow bottom sheet depth to be smaller than 1 for multi-display devices.");