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

Commit c5e64415 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Use same side-swipe check for alt bars" into sc-v2-dev am: 296e07d9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15750843

Change-Id: Iad59f99346ff44a22165e1358afc40163ee79175
parents 38561e8d 296e07d9

services/core/java/com/android/server/wm/DisplayPolicy.java

+19 −15
Original line number Original line Diff line number Diff line
@@ -482,7 +482,8 @@ public class DisplayPolicy { 
                            if (mStatusBar != null) {

                            if (mStatusBar != null) {

                                requestTransientBars(mStatusBar);

                                requestTransientBars(mStatusBar);

                            }

                            }

                            checkAltBarSwipeForTransientBars(ALT_BAR_TOP);

                            checkAltBarSwipeForTransientBars(ALT_BAR_TOP,

                                    false /* allowForAllPositions */);

                        }

                        }

                    }

                    }
@@ -493,7 +494,8 @@ public class DisplayPolicy { 
                                    && mNavigationBarPosition == NAV_BAR_BOTTOM) {

                                    && mNavigationBarPosition == NAV_BAR_BOTTOM) {

                                requestTransientBars(mNavigationBar);

                                requestTransientBars(mNavigationBar);

                            }

                            }

                            checkAltBarSwipeForTransientBars(ALT_BAR_BOTTOM);

                            checkAltBarSwipeForTransientBars(ALT_BAR_BOTTOM,

                                    false /* allowForAllPositions */);

                        }

                        }

                    }

                    }
@@ -503,13 +505,13 @@ public class DisplayPolicy { 
                        synchronized (mLock) {

                        synchronized (mLock) {

                            mDisplayContent.calculateSystemGestureExclusion(

                            mDisplayContent.calculateSystemGestureExclusion(

                                    excludedRegion, null /* outUnrestricted */);

                                    excludedRegion, null /* outUnrestricted */);

                            final boolean excluded =

                            final boolean allowSideSwipe = mNavigationBarAlwaysShowOnSideGesture &&

                                    mSystemGestures.currentGestureStartedInRegion(excludedRegion);

                                    !mSystemGestures.currentGestureStartedInRegion(excludedRegion);

                            if (mNavigationBar != null && (mNavigationBarPosition == NAV_BAR_RIGHT

                            if (mNavigationBar != null && (mNavigationBarPosition == NAV_BAR_RIGHT

                                    || !excluded && mNavigationBarAlwaysShowOnSideGesture)) {

                                    || allowSideSwipe)) {

                                requestTransientBars(mNavigationBar);

                                requestTransientBars(mNavigationBar);

                            }

                            }

                            checkAltBarSwipeForTransientBars(ALT_BAR_RIGHT);

                            checkAltBarSwipeForTransientBars(ALT_BAR_RIGHT, allowSideSwipe);

                        }

                        }

                        excludedRegion.recycle();

                        excludedRegion.recycle();

                    }

                    }
@@ -520,13 +522,13 @@ public class DisplayPolicy { 
                        synchronized (mLock) {

                        synchronized (mLock) {

                            mDisplayContent.calculateSystemGestureExclusion(

                            mDisplayContent.calculateSystemGestureExclusion(

                                    excludedRegion, null /* outUnrestricted */);

                                    excludedRegion, null /* outUnrestricted */);

                            final boolean excluded =

                            final boolean allowSideSwipe = mNavigationBarAlwaysShowOnSideGesture &&

                                    mSystemGestures.currentGestureStartedInRegion(excludedRegion);

                                    !mSystemGestures.currentGestureStartedInRegion(excludedRegion);

                            if (mNavigationBar != null && (mNavigationBarPosition == NAV_BAR_LEFT

                            if (mNavigationBar != null && (mNavigationBarPosition == NAV_BAR_LEFT

                                    || !excluded && mNavigationBarAlwaysShowOnSideGesture)) {

                                    || allowSideSwipe)) {

                                requestTransientBars(mNavigationBar);

                                requestTransientBars(mNavigationBar);

                            }

                            }

                            checkAltBarSwipeForTransientBars(ALT_BAR_LEFT);

                            checkAltBarSwipeForTransientBars(ALT_BAR_LEFT, allowSideSwipe);

                        }

                        }

                        excludedRegion.recycle();

                        excludedRegion.recycle();

                    }

                    }
@@ -680,17 +682,19 @@ public class DisplayPolicy { 
        mHandler.post(mGestureNavigationSettingsObserver::register);

        mHandler.post(mGestureNavigationSettingsObserver::register);

    }

    }





    private void checkAltBarSwipeForTransientBars(@WindowManagerPolicy.AltBarPosition int pos) {

    private void checkAltBarSwipeForTransientBars(@WindowManagerPolicy.AltBarPosition int pos,

        if (mStatusBarAlt != null && mStatusBarAltPosition == pos) {

            boolean allowForAllPositions) {

        if (mStatusBarAlt != null && (mStatusBarAltPosition == pos || allowForAllPositions)) {

            requestTransientBars(mStatusBarAlt);

            requestTransientBars(mStatusBarAlt);

        }

        }

        if (mNavigationBarAlt != null && mNavigationBarAltPosition == pos) {

        if (mNavigationBarAlt != null

                && (mNavigationBarAltPosition == pos || allowForAllPositions)) {

            requestTransientBars(mNavigationBarAlt);

            requestTransientBars(mNavigationBarAlt);

        }

        }

        if (mClimateBarAlt != null && mClimateBarAltPosition == pos) {

        if (mClimateBarAlt != null && (mClimateBarAltPosition == pos || allowForAllPositions)) {

            requestTransientBars(mClimateBarAlt);

            requestTransientBars(mClimateBarAlt);

        }

        }

        if (mExtraNavBarAlt != null && mExtraNavBarAltPosition == pos) {

        if (mExtraNavBarAlt != null && (mExtraNavBarAltPosition == pos || allowForAllPositions)) {

            requestTransientBars(mExtraNavBarAlt);

            requestTransientBars(mExtraNavBarAlt);

        }

        }

    }

    }