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

Commit ab928b02 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Ignore nav bar alpha changes while user is not yet setup"

parents 6878ded8 79dcb872

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

+17 −2
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ import com.android.systemui.stackdivider.Divider; 
import com.android.systemui.statusbar.AutoHideUiElement;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.CommandQueue.Callbacks;

import com.android.systemui.statusbar.NavigationBarController;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.notification.stack.StackStateAnimator;
@@ -132,7 +131,6 @@ import com.android.systemui.util.LifecycleFragment; 


import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.lang.ref.WeakReference;

import java.util.List;

import java.util.Locale;

import java.util.Optional;
@@ -194,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;
@@ -313,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)) {
@@ -414,6 +417,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,
@@ -481,6 +492,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
@@ -489,6 +503,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        mNavigationModeController.removeListener(this);

        mAccessibilityManagerWrapper.removeCallback(mAccessibilityListener);

        mContentResolver.unregisterContentObserver(mAssistContentObserver);

        mDeviceProvisionedController.removeCallback(mUserSetupListener);



        DeviceConfig.removeOnPropertiesChangedListener(mOnPropertiesChangedListener);

    }