diff options
author | Chris Banes <chrisbanes@google.com> | 2015-04-14 10:43:16 +0100 |
---|---|---|
committer | Chris Banes <chrisbanes@google.com> | 2015-04-14 10:44:14 +0100 |
commit | 36344a90c226c90243e4e02bfb13589e120431dd (patch) | |
tree | 2e37a156768b554926bb4ec85014bbc10b25031f | |
parent | 989b5b26be4081dd3b24ecb36e856cfa83759180 (diff) | |
download | frameworks_base-36344a90c226c90243e4e02bfb13589e120431dd.zip frameworks_base-36344a90c226c90243e4e02bfb13589e120431dd.tar.gz frameworks_base-36344a90c226c90243e4e02bfb13589e120431dd.tar.bz2 |
Unhide PopupWindow window layout type calls
BUG: 20172711
Change-Id: I31bacf840908f77d2be96a6b10df495e30f0af07
-rw-r--r-- | api/current.txt | 2 | ||||
-rw-r--r-- | api/system-current.txt | 2 | ||||
-rw-r--r-- | core/java/android/widget/PopupWindow.java | 13 |
3 files changed, 12 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index ee6a667..cadc38a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39525,6 +39525,7 @@ package android.widget { method public boolean getOverlapAnchor(); method public int getSoftInputMode(); method public int getWidth(); + method public int getWindowLayoutType(); method public boolean isAboveAnchor(); method public boolean isAttachedInDecor(); method public boolean isClippingEnabled(); @@ -39554,6 +39555,7 @@ package android.widget { method public void setTouchable(boolean); method public void setWidth(int); method public deprecated void setWindowLayoutMode(int, int); + method public void setWindowLayoutType(int); method public void showAsDropDown(android.view.View); method public void showAsDropDown(android.view.View, int, int); method public void showAsDropDown(android.view.View, int, int, int); diff --git a/api/system-current.txt b/api/system-current.txt index ee076c2..86c05b5 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -42449,6 +42449,7 @@ package android.widget { method public boolean getOverlapAnchor(); method public int getSoftInputMode(); method public int getWidth(); + method public int getWindowLayoutType(); method public boolean isAboveAnchor(); method public boolean isAttachedInDecor(); method public boolean isClippingEnabled(); @@ -42478,6 +42479,7 @@ package android.widget { method public void setTouchable(boolean); method public void setWidth(int); method public deprecated void setWindowLayoutMode(int, int); + method public void setWindowLayoutType(int); method public void showAsDropDown(android.view.View); method public void showAsDropDown(android.view.View, int, int); method public void showAsDropDown(android.view.View, int, int, int); diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index 8792323..c5b5c84 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -860,19 +860,22 @@ public class PopupWindow { } /** - * Set the layout type for this window. Should be one of the TYPE constants defined in - * {@link WindowManager.LayoutParams}. + * 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. * * @param layoutType Layout type for this window. - * @hide + * + * @see WindowManager.LayoutParams#type */ public void setWindowLayoutType(int layoutType) { mWindowLayoutType = layoutType; } /** - * @return The layout type for this window. - * @hide + * Returns the layout type for this window. + * + * @see #setWindowLayoutType(int) */ public int getWindowLayoutType() { return mWindowLayoutType; |