diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/OverviewProxyService.java | 5 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java index 2983df6ec937..816c598daf4f 100644 --- a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java @@ -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; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index b4cb088621fd..84582b0278f2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -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); |