Merge "Restore navbar transparency state on config change" into qt-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
0c7f7a1ee6
@@ -608,6 +608,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
|
||||
mConnectionCallbacks.add(listener);
|
||||
listener.onConnectionChanged(mOverviewProxy != null);
|
||||
listener.onInteractionFlagsChanged(mInteractionFlags);
|
||||
listener.onBackButtonAlphaChanged(mBackButtonAlpha, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -151,7 +151,7 @@ public class NavigationBarController implements Callbacks {
|
||||
? Dependency.get(AutoHideController.class)
|
||||
: new AutoHideController(context, mHandler);
|
||||
navBar.setAutoHideController(autoHideController);
|
||||
navBar.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
|
||||
navBar.restoreSystemUiVisibilityState();
|
||||
mNavigationBars.append(displayId, navBar);
|
||||
|
||||
if (result != null) {
|
||||
|
||||
@@ -123,6 +123,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
|
||||
private static final boolean DEBUG = false;
|
||||
private static final String EXTRA_DISABLE_STATE = "disabled_state";
|
||||
private static final String EXTRA_DISABLE2_STATE = "disabled2_state";
|
||||
private static final String EXTRA_SYSTEM_UI_VISIBILITY = "system_ui_visibility";
|
||||
|
||||
/** Allow some time inbetween the long press for back and recents. */
|
||||
private static final int LOCK_TO_APP_GESTURE_TOLERENCE = 200;
|
||||
@@ -156,7 +157,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
|
||||
private Locale mLocale;
|
||||
private int mLayoutDirection;
|
||||
|
||||
private int mSystemUiVisibility;
|
||||
private int mSystemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE;
|
||||
private LightBarController mLightBarController;
|
||||
private AutoHideController mAutoHideController;
|
||||
|
||||
@@ -277,6 +278,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
|
||||
if (savedInstanceState != null) {
|
||||
mDisabledFlags1 = savedInstanceState.getInt(EXTRA_DISABLE_STATE, 0);
|
||||
mDisabledFlags2 = savedInstanceState.getInt(EXTRA_DISABLE2_STATE, 0);
|
||||
mSystemUiVisibility = savedInstanceState.getInt(EXTRA_SYSTEM_UI_VISIBILITY, 0);
|
||||
}
|
||||
mAccessibilityManagerWrapper.addCallback(mAccessibilityListener);
|
||||
|
||||
@@ -363,6 +365,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
|
||||
super.onSaveInstanceState(outState);
|
||||
outState.putInt(EXTRA_DISABLE_STATE, mDisabledFlags1);
|
||||
outState.putInt(EXTRA_DISABLE2_STATE, mDisabledFlags2);
|
||||
outState.putInt(EXTRA_SYSTEM_UI_VISIBILITY, mSystemUiVisibility);
|
||||
if (mNavigationBarView != null) {
|
||||
mNavigationBarView.getLightTransitionsController().saveState(outState);
|
||||
}
|
||||
@@ -492,13 +495,8 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets System UI flags to {@link NavigationBarFragment}.
|
||||
*
|
||||
* @see View#setSystemUiVisibility(int)
|
||||
*/
|
||||
public void setSystemUiVisibility(int systemUiVisibility) {
|
||||
mSystemUiVisibility = systemUiVisibility;
|
||||
/** Restores the System UI flags saved state to {@link NavigationBarFragment}. */
|
||||
public void restoreSystemUiVisibilityState() {
|
||||
final int barMode = computeBarMode(0, mSystemUiVisibility);
|
||||
if (barMode != -1) {
|
||||
mNavigationBarMode = barMode;
|
||||
|
||||
Reference in New Issue
Block a user