Merge "Fix navigation bar flaky tests" (126a2d2c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/DisplayPolicy.java

+17 −17

Original line number	Diff line number	Diff line
		@@ -505,23 +505,6 @@ public class DisplayPolicy {
		// TODO: Make it can take screenshot on external display
		mScreenshotHelper = displayContent.isDefaultDisplay
		? new ScreenshotHelper(mContext) : null;
		}

		void systemReady() {
		mSystemGestures.systemReady();
		}

		private int getDisplayId() {
		return mDisplayContent.getDisplayId();
		}

		void onDisplayRemoved() {
		mDisplayContent.unregisterPointerEventListener(mSystemGestures);
		}

		void configure(int width, int height, int shortSizeDp) {
		// Allow the navigation bar to move on non-square small devices (phones).
		mNavigationBarCanMove = width != height && shortSizeDp < 600;

		if (mDisplayContent.isDefaultDisplay) {
		mHasStatusBar = true;
		@@ -541,6 +524,23 @@ public class DisplayPolicy {
		}
		}

		void systemReady() {
		mSystemGestures.systemReady();
		}

		private int getDisplayId() {
		return mDisplayContent.getDisplayId();
		}

		void onDisplayRemoved() {
		mDisplayContent.unregisterPointerEventListener(mSystemGestures);
		}

		void configure(int width, int height, int shortSizeDp) {
		// Allow the navigation bar to move on non-square small devices (phones).
		mNavigationBarCanMove = width != height && shortSizeDp < 600;
		}

		void updateConfigurationDependentBehaviors() {
		mNavBarOpacityMode = mContext.getResources().getInteger(R.integer.config_navBarOpacityMode);
		}