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

Commit 9822fffc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Opalayout can check quickstep icons without needing navbarview (1/2)" into pi-dev

parents 36a7eece c1a97b12

packages/SystemUI/src/com/android/systemui/OverviewProxyService.java

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import java.io.PrintWriter; 
import java.util.ArrayList;

import java.util.List;



import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_DISABLE_SWIPE_UP;

import static com.android.systemui.shared.system.NavigationBarCompat.InteractionType;



/**
@@ -249,6 +250,10 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
        mConnectionCallbacks.remove(listener);

    }



    public boolean shouldShowSwipeUpUI() {

        return getProxy() != null && ((mInteractionFlags & FLAG_DISABLE_SWIPE_UP) == 0);

    }



    public IOverviewProxy getProxy() {

        return mOverviewProxy;

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

+3 −8
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ import java.io.PrintWriter; 
import java.util.function.Consumer;



import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_DISABLE_QUICK_SCRUB;

import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_DISABLE_SWIPE_UP;

import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_HIDE_BACK_BUTTON;

import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_SHOW_OVERVIEW_BUTTON;

import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_OVERVIEW;
@@ -385,17 +384,13 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
    }



    public boolean isQuickStepSwipeUpEnabled() {

        return mOverviewProxyService.getProxy() != null

                && isOverviewEnabled()

                && ((mOverviewProxyService.getInteractionFlags()

                        & FLAG_DISABLE_SWIPE_UP) == 0);

        return mOverviewProxyService.shouldShowSwipeUpUI() && isOverviewEnabled();

    }



    public boolean isQuickScrubEnabled() {

        return SystemProperties.getBoolean("persist.quickstep.scrub.enabled", true)

                && mOverviewProxyService.getProxy() != null && isOverviewEnabled()

                && ((mOverviewProxyService.getInteractionFlags()

                        & FLAG_DISABLE_QUICK_SCRUB) == 0);

                && ((mOverviewProxyService.getInteractionFlags() & FLAG_DISABLE_QUICK_SCRUB) == 0);

    }



    private void updateCarModeIcons(Context ctx) {
@@ -468,7 +463,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
    private KeyButtonDrawable chooseNavigationIconDrawable(Context ctx, @DrawableRes int iconLight,

            @DrawableRes int iconDark, @DrawableRes int quickStepIconLight,

            @DrawableRes int quickStepIconDark) {

        final boolean quickStepEnabled = isQuickStepSwipeUpEnabled() || isQuickScrubEnabled();

        final boolean quickStepEnabled = mOverviewProxyService.shouldShowSwipeUpUI();

        return quickStepEnabled

                ? getDrawable(ctx, quickStepIconLight, quickStepIconDark)

                : getDrawable(ctx, iconLight, iconDark);