summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorChris Banes <chrisbanes@google.com>2015-04-15 07:05:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-15 07:05:51 +0000
commit5c1405e10c223261bc3d4fef4671f069cadf760c (patch)
tree806d516ccfab4dcabe609ee1c74e7356e8e7dd78 /api
parent8b669747584dd4d13b97c8a33ced2d11327b4042 (diff)
parent36344a90c226c90243e4e02bfb13589e120431dd (diff)
downloadframeworks_base-5c1405e10c223261bc3d4fef4671f069cadf760c.zip
frameworks_base-5c1405e10c223261bc3d4fef4671f069cadf760c.tar.gz
frameworks_base-5c1405e10c223261bc3d4fef4671f069cadf760c.tar.bz2
Merge "Unhide PopupWindow window layout type calls"
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 38850ab..b307d61 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -39810,6 +39810,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();
@@ -39839,6 +39840,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 a570d86..9184d8b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -42735,6 +42735,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();
@@ -42764,6 +42765,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);