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

Commit 78f0efd3 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by android-build-merger
Browse files

Merge "Revert "RESTRICT AUTOMERGE Removing deprecated APIs added to Q"" into qt-dev 

am: 4acb8f46

Change-Id: Ideea53935ba743127298aaaa2b5a993be2679038
parents 85ff9dac 4acb8f46

api/current.txt

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

    method public int getWindowLayoutType();

    method public boolean isAboveAnchor();

    method public boolean isAboveAnchor();

    method public boolean isAttachedInDecor();

    method public boolean isAttachedInDecor();

    method @Deprecated public boolean isClipToScreenEnabled();

    method public boolean isClippedToScreen();

    method public boolean isClippedToScreen();

    method public boolean isClippingEnabled();

    method public boolean isClippingEnabled();

    method public boolean isFocusable();

    method public boolean isFocusable();

    method public boolean isLaidOutInScreen();

    method public boolean isLaidOutInScreen();

    method @Deprecated public boolean isLayoutInScreenEnabled();

    method public boolean isOutsideTouchable();

    method public boolean isOutsideTouchable();

    method public boolean isShowing();

    method public boolean isShowing();

    method public boolean isSplitTouchEnabled();

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

    method public void setAnimationStyle(int);

    method public void setAttachedInDecor(boolean);

    method public void setAttachedInDecor(boolean);

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

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

    method @Deprecated public void setClipToScreenEnabled(boolean);

    method public void setClippingEnabled(boolean);

    method public void setClippingEnabled(boolean);

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

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

    method public void setElevation(float);

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

    method public void setInputMethodMode(int);

    method public void setIsClippedToScreen(boolean);

    method public void setIsClippedToScreen(boolean);

    method public void setIsLaidOutInScreen(boolean);

    method public void setIsLaidOutInScreen(boolean);

    method @Deprecated public void setLayoutInScreenEnabled(boolean);

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

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

    method public void setOutsideTouchable(boolean);

    method public void setOutsideTouchable(boolean);

    method public void setOverlapAnchor(boolean);

    method public void setOverlapAnchor(boolean);

api/removed.txt

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

    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 {

  @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 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);

    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 Original line 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

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

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

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

     * @removed

     */

     */

    @Deprecated

    @Deprecated

    public boolean isClipToScreenEnabled() {

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

     * the {@link #update()} methods.</p>

     *

     *

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

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

     * @removed

     */

     */

    @Deprecated

    @Deprecated

    public void setClipToScreenEnabled(boolean enabled) {

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

     * @return true if the window will always be positioned in screen coordinates.

     *

     *

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

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

     * @removed

     */

     */

    @Deprecated

    @Deprecated

    public boolean isLayoutInScreenEnabled() {

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

     *

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

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

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

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

     * @removed

     */

     */

    @Deprecated

    @Deprecated

    public void setLayoutInScreenEnabled(boolean enabled) {

    public void setLayoutInScreenEnabled(boolean enabled) {