Merge "Remove opaque-on-interaction from nav bar." into klp-dev (bd847601) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1097,7 +1097,7 @@ public abstract class BaseStatusBar extends SystemUI implements
		return km.inKeyguardRestrictedInputMode();
		}

		public void setInteracting(boolean interacting) {
		public void setInteracting(int barWindow, boolean interacting) {
		// hook for subclasses
		}

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.statusbar;

		import android.app.StatusBarManager;
		import android.graphics.RectF;
		import android.view.MotionEvent;
		import android.view.View;
		@@ -86,9 +87,9 @@ public class DelegateViewHelper {
		}

		if (action == MotionEvent.ACTION_DOWN) {
		mBar.setInteracting(true);
		mBar.setInteracting(StatusBarManager.WINDOW_NAVIGATION_BAR, true);
		} else if (action == MotionEvent.ACTION_UP \|\| action == MotionEvent.ACTION_CANCEL) {
		mBar.setInteracting(false);
		mBar.setInteracting(StatusBarManager.WINDOW_NAVIGATION_BAR, false);
		}

		mDelegateView.getLocationOnScreen(mTempPoint);

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

+13 −10

Original line number	Diff line number	Diff line
		@@ -306,7 +306,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
		}
		};

		private boolean mInteracting;
		private int mInteractingWindows;
		private boolean mAutohideSuspended;
		private int mStatusBarMode;
		private int mNavigationBarMode;
		@@ -1378,7 +1378,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {

		visibilityChanged(true);

		setInteracting(true);
		setInteracting(StatusBarManager.WINDOW_STATUS_BAR, true);
		}

		public void animateCollapsePanels() {
		@@ -1662,7 +1662,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
		mPostCollapseCleanup = null;
		}

		setInteracting(false);
		setInteracting(StatusBarManager.WINDOW_STATUS_BAR, false);
		}

		/**
		@@ -1738,7 +1738,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
		}

		if (mStatusBarWindowState == WINDOW_STATE_SHOWING) {
		setInteracting(true);
		setInteracting(StatusBarManager.WINDOW_STATUS_BAR, true);
		}
		return false;
		}
		@@ -1871,7 +1871,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {

		private void checkBarModes() {
		if (mDemoMode) return;
		checkBarMode(mStatusBarMode, mStatusBarWindowState, mStatusBarView.getBarTransitions());
		checkBarMode((mInteractingWindows & StatusBarManager.WINDOW_STATUS_BAR) != 0 ? MODE_OPAQUE
		: mStatusBarMode, mStatusBarWindowState, mStatusBarView.getBarTransitions());
		if (mNavigationBarView != null) {
		checkBarMode(mNavigationBarMode,
		mNavigationBarWindowState, mNavigationBarView.getBarTransitions());
		@@ -1880,7 +1881,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {

		private void checkBarMode(int mode, int windowState, BarTransitions transitions) {
		final boolean imeVisible = (mNavigationIconHints & NAVIGATION_HINT_BACK_ALT) != 0;
		final int finalMode = imeVisible \|\| mInteracting ? MODE_OPAQUE : mode;
		final int finalMode = imeVisible ? MODE_OPAQUE : mode;
		final boolean animate = windowState == WINDOW_STATE_SHOWING;
		transitions.transitionTo(finalMode, animate);
		}
		@@ -1892,9 +1893,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
		}};

		@Override
		public void setInteracting(boolean interacting) {
		mInteracting = interacting;
		if (mInteracting) {
		public void setInteracting(int barWindow, boolean interacting) {
		mInteractingWindows = interacting
		? (mInteractingWindows \| barWindow)
		: (mInteractingWindows & ~barWindow);
		if (mInteractingWindows != 0) {
		suspendAutohide();
		} else {
		resumeSuspendedAutohide();
		@@ -2117,7 +2120,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
		+ " scroll " + mScrollView.getScrollX() + "," + mScrollView.getScrollY());
		}

		pw.print(" mInteracting="); pw.println(mInteracting);
		pw.print(" mInteractingWindows="); pw.println(mInteractingWindows);
		pw.print(" mStatusBarWindowState=");
		pw.println(windowStateToString(mStatusBarWindowState));
		pw.print(" mStatusBarMode=");

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,7 @@ public class PhoneStatusBarView extends PanelBar {
		}

		private void applyMode(int mode, boolean animate) {
		if (mLeftSide == null \|\| mRightSide == null) return;
		float newAlpha = getAlphaFor(mode);
		if (animate) {
		ObjectAnimator lhs = animateTransitionTo(mLeftSide, newAlpha);

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -5056,7 +5056,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (statusBarHasFocus) {
		int flags = View.SYSTEM_UI_FLAG_FULLSCREEN
		\| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
		\| View.SYSTEM_UI_FLAG_IMMERSIVE;
		\| View.SYSTEM_UI_FLAG_IMMERSIVE
		\| View.SYSTEM_UI_FLAG_TRANSPARENT_STATUS
		\| View.SYSTEM_UI_FLAG_TRANSPARENT_NAVIGATION;
		vis = (vis & ~flags) \| (mLastSystemUiFlags & flags);
		}