Merge "Restore navbar transparency state on config change" into qt-dev am: 0c7f7a1ee6 (75100309) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -608,6 +608,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
	mConnectionCallbacks.add(listener);		mConnectionCallbacks.add(listener);
	listener.onConnectionChanged(mOverviewProxy != null);		listener.onConnectionChanged(mOverviewProxy != null);
	listener.onInteractionFlagsChanged(mInteractionFlags);		listener.onInteractionFlagsChanged(mInteractionFlags);
			listener.onBackButtonAlphaChanged(mBackButtonAlpha, false);
	}		}

	@Override		@Override

packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarController.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -151,7 +151,7 @@ public class NavigationBarController implements Callbacks {
	? Dependency.get(AutoHideController.class)		? Dependency.get(AutoHideController.class)
	: new AutoHideController(context, mHandler);		: new AutoHideController(context, mHandler);
	navBar.setAutoHideController(autoHideController);		navBar.setAutoHideController(autoHideController);
	navBar.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);		navBar.restoreSystemUiVisibilityState();
	mNavigationBars.append(displayId, navBar);		mNavigationBars.append(displayId, navBar);

	if (result != null) {		if (result != null) {

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

+6 −8

Original line number	Original line	Diff line number	Diff line
	@@ -123,6 +123,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
	private static final boolean DEBUG = false;		private static final boolean DEBUG = false;
	private static final String EXTRA_DISABLE_STATE = "disabled_state";		private static final String EXTRA_DISABLE_STATE = "disabled_state";
	private static final String EXTRA_DISABLE2_STATE = "disabled2_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. */		/** Allow some time inbetween the long press for back and recents. */
	private static final int LOCK_TO_APP_GESTURE_TOLERENCE = 200;		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 Locale mLocale;
	private int mLayoutDirection;		private int mLayoutDirection;

	private int mSystemUiVisibility;		private int mSystemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE;
	private LightBarController mLightBarController;		private LightBarController mLightBarController;
	private AutoHideController mAutoHideController;		private AutoHideController mAutoHideController;

	@@ -277,6 +278,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
	if (savedInstanceState != null) {		if (savedInstanceState != null) {
	mDisabledFlags1 = savedInstanceState.getInt(EXTRA_DISABLE_STATE, 0);		mDisabledFlags1 = savedInstanceState.getInt(EXTRA_DISABLE_STATE, 0);
	mDisabledFlags2 = savedInstanceState.getInt(EXTRA_DISABLE2_STATE, 0);		mDisabledFlags2 = savedInstanceState.getInt(EXTRA_DISABLE2_STATE, 0);
			mSystemUiVisibility = savedInstanceState.getInt(EXTRA_SYSTEM_UI_VISIBILITY, 0);
	}		}
	mAccessibilityManagerWrapper.addCallback(mAccessibilityListener);		mAccessibilityManagerWrapper.addCallback(mAccessibilityListener);

	@@ -363,6 +365,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
	super.onSaveInstanceState(outState);		super.onSaveInstanceState(outState);
	outState.putInt(EXTRA_DISABLE_STATE, mDisabledFlags1);		outState.putInt(EXTRA_DISABLE_STATE, mDisabledFlags1);
	outState.putInt(EXTRA_DISABLE2_STATE, mDisabledFlags2);		outState.putInt(EXTRA_DISABLE2_STATE, mDisabledFlags2);
			outState.putInt(EXTRA_SYSTEM_UI_VISIBILITY, mSystemUiVisibility);
	if (mNavigationBarView != null) {		if (mNavigationBarView != null) {
	mNavigationBarView.getLightTransitionsController().saveState(outState);		mNavigationBarView.getLightTransitionsController().saveState(outState);
	}		}
	@@ -492,13 +495,8 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
	}		}
	}		}

	/**		/** Restores the System UI flags saved state to {@link NavigationBarFragment}. */
	* Sets System UI flags to {@link NavigationBarFragment}.		public void restoreSystemUiVisibilityState() {
	*
	* @see View#setSystemUiVisibility(int)
	*/
	public void setSystemUiVisibility(int systemUiVisibility) {
	mSystemUiVisibility = systemUiVisibility;
	final int barMode = computeBarMode(0, mSystemUiVisibility);		final int barMode = computeBarMode(0, mSystemUiVisibility);
	if (barMode != -1) {		if (barMode != -1) {
	mNavigationBarMode = barMode;		mNavigationBarMode = barMode;