Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c1405e1 authored by Chris Banes's avatar Chris Banes Committed by Android (Google) Code Review
Browse files

Merge "Unhide PopupWindow window layout type calls"

parents 8b669747 36344a90

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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);

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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);

core/java/android/widget/PopupWindow.java

+8 −5
Original line number Diff line number Diff line
@@ -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;