Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Winson Chung
2020-08-08 03:40:29 +00:00
committed by Android (Google) Code Review
parent 6d1ef3b45e 11dcabfff1
commit 607893c94a
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,6 +192,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
private int mLayoutDirection; private int mLayoutDirection;
private boolean mForceNavBarHandleOpaque; private boolean mForceNavBarHandleOpaque;
private boolean mIsCurrentUserSetup;
/** @see android.view.WindowInsetsController#setSystemBarsAppearance(int) */ /** @see android.view.WindowInsetsController#setSystemBarsAppearance(int) */
private @Appearance int mAppearance; private @Appearance int mAppearance;
@@ -311,6 +312,10 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
@Override @Override
public void onNavBarButtonAlphaChanged(float alpha, boolean animate) { 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; ButtonDispatcher buttonDispatcher = null;
boolean forceVisible = false; boolean forceVisible = false;
if (QuickStepContract.isSwipeUpMode(mNavBarMode)) { 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 @Inject
public NavigationBarFragment(AccessibilityManagerWrapper accessibilityManagerWrapper, public NavigationBarFragment(AccessibilityManagerWrapper accessibilityManagerWrapper,
DeviceProvisionedController deviceProvisionedController, MetricsLogger metricsLogger, DeviceProvisionedController deviceProvisionedController, MetricsLogger metricsLogger,
@@ -451,6 +464,9 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
/* defaultValue = */ true); /* defaultValue = */ true);
DeviceConfig.addOnPropertiesChangedListener( DeviceConfig.addOnPropertiesChangedListener(
DeviceConfig.NAMESPACE_SYSTEMUI, mHandler::post, mOnPropertiesChangedListener); DeviceConfig.NAMESPACE_SYSTEMUI, mHandler::post, mOnPropertiesChangedListener);
mIsCurrentUserSetup = mDeviceProvisionedController.isCurrentUserSetup();
mDeviceProvisionedController.addCallback(mUserSetupListener);
} }
@Override @Override
@@ -459,6 +475,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
mNavigationModeController.removeListener(this); mNavigationModeController.removeListener(this);
mAccessibilityManagerWrapper.removeCallback(mAccessibilityListener); mAccessibilityManagerWrapper.removeCallback(mAccessibilityListener);
mContentResolver.unregisterContentObserver(mAssistContentObserver); mContentResolver.unregisterContentObserver(mAssistContentObserver);
mDeviceProvisionedController.removeCallback(mUserSetupListener);
DeviceConfig.removeOnPropertiesChangedListener(mOnPropertiesChangedListener); DeviceConfig.removeOnPropertiesChangedListener(mOnPropertiesChangedListener);
} }