resolved conflicts for merge of bbc49941 to lmp-dev (0048da21) · Commits · e / os / android_frameworks_base

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

+12 −3

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ import android.util.SparseArray;
		import android.util.TypedValue;
		import android.view.ActionMode;
		import android.view.ContextThemeWrapper;
		import android.view.Display;
		import android.view.Gravity;
		import android.view.IRotationWatcher;
		import android.view.IWindowManager;
		@@ -3182,9 +3183,17 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		if (a.getBoolean(com.android.internal.R.styleable.Window_windowContentTransitions, false)) {
		requestFeature(FEATURE_CONTENT_TRANSITIONS);
		}
		if (a.hasValue(com.android.internal.R.styleable.Window_windowOutsetBottom)) {

		final WindowManager windowService = (WindowManager) getContext().getSystemService(
		Context.WINDOW_SERVICE);
		if (windowService != null) {
		final Display display = windowService.getDefaultDisplay();
		if (display.getDisplayId() == Display.DEFAULT_DISPLAY &&
		a.hasValue(com.android.internal.R.styleable.Window_windowOutsetBottom)) {
		if (mOutsetBottom == null) mOutsetBottom = new TypedValue();
		a.getValue(com.android.internal.R.styleable.Window_windowOutsetBottom, mOutsetBottom);
		a.getValue(com.android.internal.R.styleable.Window_windowOutsetBottom,
		mOutsetBottom);
		}
		}

		final Context context = getContext();