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

Commit f6f30d3a authored by Ian Pedowitz's avatar Ian Pedowitz
Browse files

Revert "RESTRICT AUTOMERGE Removing deprecated APIs added to Q" 

This reverts commit f6ed8afa.

Reason for revert: QT SDK Finalization. Will be merged again on/after May 13th

Bug: 129975435
Change-Id: If94098b7cc9cf75cf9782d2b70e01881f9c40430
(cherry picked from commit 1600c5a6)
parent d664b911

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -56250,10 +56250,12 @@ package android.widget { 
    method public int getWindowLayoutType();

    method public boolean isAboveAnchor();

    method public boolean isAttachedInDecor();

    method @Deprecated public boolean isClipToScreenEnabled();

    method public boolean isClippedToScreen();

    method public boolean isClippingEnabled();

    method public boolean isFocusable();

    method public boolean isLaidOutInScreen();

    method @Deprecated public boolean isLayoutInScreenEnabled();

    method public boolean isOutsideTouchable();

    method public boolean isShowing();

    method public boolean isSplitTouchEnabled();
@@ -56262,6 +56264,7 @@ package android.widget { 
    method public void setAnimationStyle(int);

    method public void setAttachedInDecor(boolean);

    method public void setBackgroundDrawable(android.graphics.drawable.Drawable);

    method @Deprecated public void setClipToScreenEnabled(boolean);

    method public void setClippingEnabled(boolean);

    method public void setContentView(android.view.View);

    method public void setElevation(float);
@@ -56274,6 +56277,7 @@ package android.widget { 
    method public void setInputMethodMode(int);

    method public void setIsClippedToScreen(boolean);

    method public void setIsLaidOutInScreen(boolean);

    method @Deprecated public void setLayoutInScreenEnabled(boolean);

    method public void setOnDismissListener(android.widget.PopupWindow.OnDismissListener);

    method public void setOutsideTouchable(boolean);

    method public void setOverlapAnchor(boolean);

api/removed.txt

+0 −7
Original line number Diff line number Diff line
@@ -691,13 +691,6 @@ package android.widget { 
    method protected <T extends android.view.View> T findViewWithTagTraversal(Object);

  }



  public class PopupWindow {

    method @Deprecated public boolean isClipToScreenEnabled();

    method @Deprecated public boolean isLayoutInScreenEnabled();

    method @Deprecated public void setClipToScreenEnabled(boolean);

    method @Deprecated public void setLayoutInScreenEnabled(boolean);

  }



  @android.widget.RemoteViews.RemoteView public class TextView extends android.view.View implements android.view.ViewTreeObserver.OnPreDrawListener {

    method public static int getTextColor(android.content.Context, android.content.res.TypedArray, int);

    method public static android.content.res.ColorStateList getTextColors(android.content.Context, android.content.res.TypedArray);

core/java/android/widget/PopupWindow.java

+0 −4
Original line number Diff line number Diff line
@@ -887,7 +887,6 @@ public class PopupWindow { 
     *

     * @return true if popup will be clipped to the screen instead of the window, false otherwise

     * @deprecated Use {@link #isClippedToScreen()} instead

     * @removed

     */

    @Deprecated

    public boolean isClipToScreenEnabled() {
@@ -902,7 +901,6 @@ public class PopupWindow { 
     * the {@link #update()} methods.</p>

     *

     * @deprecated Use {@link #setIsClippedToScreen(boolean)} instead

     * @removed

     */

    @Deprecated

    public void setClipToScreenEnabled(boolean enabled) {
@@ -990,7 +988,6 @@ public class PopupWindow { 
     * @return true if the window will always be positioned in screen coordinates.

     *

     * @deprecated Use {@link #isLaidOutInScreen()} instead

     * @removed

     */

    @Deprecated

    public boolean isLayoutInScreenEnabled() {
@@ -1004,7 +1001,6 @@ public class PopupWindow { 
     *

     * @param enabled true if the popup should always be positioned in screen coordinates

     * @deprecated Use {@link #setIsLaidOutInScreen(boolean)} instead

     * @removed

     */

    @Deprecated

    public void setLayoutInScreenEnabled(boolean enabled) {