Merge "Only reorient nav bar if needed" into nyc-mr1-dev (34b68d3c) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ public class NavigationBarView extends LinearLayout {

		boolean mVertical;
		boolean mScreenOn;
		private int mCurrentRotation = -1;

		boolean mShowMenu;
		int mDisabledFlags = 0;
		@@ -526,6 +527,10 @@ public class NavigationBarView extends LinearLayout {
		updateCurrentView();
		}

		public boolean needsReorient() {
		return mCurrentRotation != mDisplay.getRotation();
		}

		private void updateCurrentView() {
		final int rot = mDisplay.getRotation();
		for (int i=0; i<4; i++) {
		@@ -538,6 +543,7 @@ public class NavigationBarView extends LinearLayout {
		mButtonDisatchers.valueAt(i).setCurrentView(mCurrentView);
		}
		updateLayoutTransitionsEnabled();
		mCurrentRotation = rot;
		}

		private void updateRecentsIcon() {

+2 −1

Original line number	Diff line number	Diff line
		@@ -3553,7 +3553,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

		@Override
		public void onDisplayChanged(int displayId) {
		if (displayId == Display.DEFAULT_DISPLAY) {
		if (displayId == Display.DEFAULT_DISPLAY
		&& mNavigationBarView != null && mNavigationBarView.needsReorient()) {
		repositionNavigationBar();
		}
		}