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

Commit 95d769e4 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Expose rotation button as hit target for deferring recents animation."... 

Merge "Expose rotation button as hit target for deferring recents animation." into pi-dev am: 800a8a8e
am: 39ce6689

Change-Id: I552781076a7729a7e1f557771947cfb08b9fa9e9
parents 22e13aac 39ce6689

packages/SystemUI/shared/src/com/android/systemui/shared/system/NavigationBarCompat.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,7 @@ public class NavigationBarCompat { 
    public static final int HIT_TARGET_BACK = 1;

    public static final int HIT_TARGET_BACK = 1;

    public static final int HIT_TARGET_HOME = 2;

    public static final int HIT_TARGET_HOME = 2;

    public static final int HIT_TARGET_OVERVIEW = 3;

    public static final int HIT_TARGET_OVERVIEW = 3;

    public static final int HIT_TARGET_ROTATION = 4;





    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    @IntDef({FLAG_DISABLE_SWIPE_UP,

    @IntDef({FLAG_DISABLE_SWIPE_UP,

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -88,6 +88,7 @@ import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_DISABL 
import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_HIDE_BACK_BUTTON;

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.FLAG_SHOW_OVERVIEW_BUTTON;

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

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

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





public class NavigationBarView extends FrameLayout implements PluginListener<NavGesture> {

public class NavigationBarView extends FrameLayout implements PluginListener<NavGesture> {

    final static boolean DEBUG = false;

    final static boolean DEBUG = false;
@@ -116,6 +117,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
    private Rect mHomeButtonBounds = new Rect();

    private Rect mHomeButtonBounds = new Rect();

    private Rect mBackButtonBounds = new Rect();

    private Rect mBackButtonBounds = new Rect();

    private Rect mRecentsButtonBounds = new Rect();

    private Rect mRecentsButtonBounds = new Rect();

    private Rect mRotationButtonBounds = new Rect();

    private int[] mTmpPosition = new int[2];

    private int[] mTmpPosition = new int[2];





    private KeyButtonDrawable mBackIcon, mBackLandIcon, mBackAltIcon, mBackAltLandIcon;

    private KeyButtonDrawable mBackIcon, mBackLandIcon, mBackAltIcon, mBackAltLandIcon;
@@ -341,6 +343,8 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
                    mDownHitTarget = HIT_TARGET_HOME;

                    mDownHitTarget = HIT_TARGET_HOME;

                } else if (mRecentsButtonBounds.contains(x, y)) {

                } else if (mRecentsButtonBounds.contains(x, y)) {

                    mDownHitTarget = HIT_TARGET_OVERVIEW;

                    mDownHitTarget = HIT_TARGET_OVERVIEW;

                } else if (mRotationButtonBounds.contains(x, y)) {

                    mDownHitTarget = HIT_TARGET_ROTATION;

                }

                }

                break;

                break;

        }

        }
@@ -893,6 +897,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        updateButtonLocationOnScreen(getBackButton(), mBackButtonBounds);

        updateButtonLocationOnScreen(getBackButton(), mBackButtonBounds);

        updateButtonLocationOnScreen(getHomeButton(), mHomeButtonBounds);

        updateButtonLocationOnScreen(getHomeButton(), mHomeButtonBounds);

        updateButtonLocationOnScreen(getRecentsButton(), mRecentsButtonBounds);

        updateButtonLocationOnScreen(getRecentsButton(), mRecentsButtonBounds);

        updateButtonLocationOnScreen(getRotateSuggestionButton(), mRotationButtonBounds);

        mGestureHelper.onLayout(changed, left, top, right, bottom);

        mGestureHelper.onLayout(changed, left, top, right, bottom);

        mRecentsOnboarding.setNavBarHeight(getMeasuredHeight());

        mRecentsOnboarding.setNavBarHeight(getMeasuredHeight());

    }

    }