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

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

Merge "Ignore nav bar alpha changes while user is not yet setup" into rvc-qpr-dev am: 607893c9 

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

Change-Id: I4761558e13c14a6eb239ea4064a2ffc174213b9e
parents 0278513d 607893c9

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

+17 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
    private int mLayoutDirection;



    private boolean mForceNavBarHandleOpaque;

    private boolean mIsCurrentUserSetup;



    /** @see android.view.WindowInsetsController#setSystemBarsAppearance(int) */

    private @Appearance int mAppearance;
@@ -311,6 +312,10 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 


        @Override

        public void onNavBarButtonAlphaChanged(float alpha, boolean animate) {

            if (!mIsCurrentUserSetup) {

                // If the current user is not yet setup, then don't update any button alphas

                return;

            }

            ButtonDispatcher buttonDispatcher = null;

            boolean forceVisible = false;

            if (QuickStepContract.isSwipeUpMode(mNavBarMode)) {
@@ -384,6 +389,14 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        }

    };



    private final DeviceProvisionedController.DeviceProvisionedListener mUserSetupListener =

            new DeviceProvisionedController.DeviceProvisionedListener() {

        @Override

        public void onUserSetupChanged() {

            mIsCurrentUserSetup = mDeviceProvisionedController.isCurrentUserSetup();

        }

    };



    @Inject

    public NavigationBarFragment(AccessibilityManagerWrapper accessibilityManagerWrapper,

            DeviceProvisionedController deviceProvisionedController, MetricsLogger metricsLogger,
@@ -451,6 +464,9 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
                /* defaultValue = */ true);

        DeviceConfig.addOnPropertiesChangedListener(

                DeviceConfig.NAMESPACE_SYSTEMUI, mHandler::post, mOnPropertiesChangedListener);



        mIsCurrentUserSetup = mDeviceProvisionedController.isCurrentUserSetup();

        mDeviceProvisionedController.addCallback(mUserSetupListener);

    }



    @Override
@@ -459,6 +475,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        mNavigationModeController.removeListener(this);

        mAccessibilityManagerWrapper.removeCallback(mAccessibilityListener);

        mContentResolver.unregisterContentObserver(mAssistContentObserver);

        mDeviceProvisionedController.removeCallback(mUserSetupListener);



        DeviceConfig.removeOnPropertiesChangedListener(mOnPropertiesChangedListener);

    }