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

Commit 52c134ea authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Show floating rotation button in sticky immersive mode if in gesture... 

Merge "Show floating rotation button in sticky immersive mode if in gesture nav" into tm-qpr-dev am: 21fc900a am: 6aac32a3

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



Change-Id: Ifba1ded1a15b565a9b2ed0c6e98dc20d2f5e7559
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b234e7c5 6aac32a3

packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java

+8 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.content.pm.PackageManager.FEATURE_PC; 
import static android.view.Display.DEFAULT_DISPLAY;



import static com.android.internal.view.RotationPolicy.NATURAL_ROTATION;

import static com.android.systemui.shared.system.QuickStepContract.isGesturalMode;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -97,6 +98,7 @@ public class RotationButtonController { 
    @SuppressLint("InlinedApi")

    private @WindowInsetsController.Behavior

    int mBehavior = WindowInsetsController.BEHAVIOR_DEFAULT;

    private int mNavBarMode;

    private boolean mSkipOverrideUserLockPrefsOnce;

    private final int mLightIconColor;

    private final int mDarkIconColor;
@@ -397,6 +399,10 @@ public class RotationButtonController { 
        if (rotateSuggestionsDisabled) onRotationSuggestionsDisabled();

    }



    public void onNavigationModeChanged(int mode) {

        mNavBarMode = mode;

    }



    public void onBehaviorChanged(int displayId, @WindowInsetsController.Behavior int behavior) {

        if (DEFAULT_DISPLAY != displayId) {

            return;
@@ -433,7 +439,8 @@ public class RotationButtonController { 
     */

    @SuppressLint("InlinedApi")

    private boolean canShowRotationButton() {

        return mIsNavigationBarShowing || mBehavior == WindowInsetsController.BEHAVIOR_DEFAULT;

        return mIsNavigationBarShowing || mBehavior == WindowInsetsController.BEHAVIOR_DEFAULT

                || isGesturalMode(mNavBarMode);

    }



    @DrawableRes

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+1 −0
Original line number Diff line number Diff line
@@ -812,6 +812,7 @@ public class NavigationBarView extends FrameLayout { 
        mImeDrawsImeNavBar = imeDrawsImeNavBar;

        mBarTransitions.onNavigationModeChanged(mNavBarMode);

        mEdgeBackGestureHandler.onNavigationModeChanged(mNavBarMode);

        mRotationButtonController.onNavigationModeChanged(mNavBarMode);

        updateRotationButton();

    }