Merge "Sends the correct content insets to status bar" (e91a82d7) · Commits · e / os / android_frameworks_base

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

+11 −3

Original line number	Diff line number	Diff line
		@@ -1920,11 +1920,19 @@ public class DisplayPolicy {
		vf.set(displayFrames.mStable);

		if (adjust == SOFT_INPUT_ADJUST_RESIZE) {
		// cf.bottom should not be below the stable bottom, or the content might be obscured
		// by the navigation bar.
		if (cf.bottom > displayFrames.mContent.bottom) {
		cf.bottom = displayFrames.mContent.bottom;
		}
		} else {
		if (cf.bottom > displayFrames.mDock.bottom) {
		cf.bottom = displayFrames.mDock.bottom;
		}
		if (vf.bottom > displayFrames.mContent.bottom) {
		vf.bottom = displayFrames.mContent.bottom;
		}
		}
		} else {
		dcf.set(displayFrames.mSystem);
		final boolean inheritTranslucentDecor =