Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-dev (4d5c20c6) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -40658,6 +40658,7 @@ package android.widget {
		method public void setSoftInputMode(int);
		method public void setVerticalOffset(int);
		method public void setWidth(int);
		method public void setWindowLayoutType(int);
		method public void show();
		field public static final int INPUT_METHOD_FROM_FOCUSABLE = 0; // 0x0
		field public static final int INPUT_METHOD_NEEDED = 1; // 0x1

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -43180,6 +43180,7 @@ package android.widget {
		method public void setSoftInputMode(int);
		method public void setVerticalOffset(int);
		method public void setWidth(int);
		method public void setWindowLayoutType(int);
		method public void show();
		field public static final int INPUT_METHOD_FROM_FOCUSABLE = 0; // 0x0
		field public static final int INPUT_METHOD_NEEDED = 1; // 0x1

core/java/android/widget/Editor.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -2421,7 +2421,8 @@ public class Editor {
		public PinnedPopupWindow() {
		createPopupWindow();

		mPopupWindow.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
		mPopupWindow.setWindowLayoutType(
		WindowManager.LayoutParams.TYPE_APPLICATION_ABOVE_SUB_PANEL);
		mPopupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
		mPopupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);

core/java/android/widget/ListPopupWindow.java

+17 −1

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import android.view.View.OnTouchListener;
		import android.view.ViewConfiguration;
		import android.view.ViewGroup;
		import android.view.ViewParent;
		import android.view.WindowManager;
		import android.view.animation.AccelerateDecelerateInterpolator;

		import com.android.internal.R;
		@@ -77,6 +78,7 @@ public class ListPopupWindow {
		private int mDropDownWidth = ViewGroup.LayoutParams.WRAP_CONTENT;
		private int mDropDownHorizontalOffset;
		private int mDropDownVerticalOffset;
		private int mDropDownWindowLayoutType = WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL;
		private boolean mDropDownVerticalOffsetSet;

		private int mDropDownGravity = Gravity.NO_GRAVITY;
		@@ -514,6 +516,19 @@ public class ListPopupWindow {
		mDropDownHeight = height;
		}

		/**
		* Set the layout type for this popup window.
		* <p>
		* See {@link WindowManager.LayoutParams#type} for possible values.
		*
		* @param layoutType Layout type for this window.
		*
		* @see WindowManager.LayoutParams#type
		*/
		public void setWindowLayoutType(int layoutType) {
		mDropDownWindowLayoutType = layoutType;
		}

		/**
		* Sets a listener to receive events when a list item is clicked.
		*
		@@ -567,8 +582,9 @@ public class ListPopupWindow {
		public void show() {
		int height = buildDropDown();

		boolean noInputMethod = isInputMethodNotNeeded();
		final boolean noInputMethod = isInputMethodNotNeeded();
		mPopup.setAllowScrollingAnchorParent(!noInputMethod);
		mPopup.setWindowLayoutType(mDropDownWindowLayoutType);

		if (mPopup.isShowing()) {
		final int widthSpec;

core/java/android/widget/PopupWindow.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -829,9 +829,9 @@ public class PopupWindow {
		}

		/**
		* Set the layout type for this window. This value will be passed through to
		* {@link WindowManager.LayoutParams#type} therefore the value should match any value
		* {@link WindowManager.LayoutParams#type} accepts.
		* Set the layout type for this window.
		* <p>
		* See {@link WindowManager.LayoutParams#type} for possible values.
		*
		* @param layoutType Layout type for this window.
		*