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

Commit 91793617 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by Android (Google) Code Review
Browse files

Merge changes from topic "QT-SDK-Finalization" into qt-dev 

* changes:
  RESTRICT AUTOMERGE Android Q is API 29
  RESTRICT AUTOMERGE Removing deprecated APIs added to Q
parents 295736ff 8a3d1f96

api/current.txt

+1 −5
Original line number Diff line number Diff line
@@ -34164,7 +34164,7 @@ package android.os { 
    field public static final int O = 26; // 0x1a

    field public static final int O_MR1 = 27; // 0x1b

    field public static final int P = 28; // 0x1c

    field public static final int Q = 10000; // 0x2710

    field public static final int Q = 29; // 0x1d

  }















  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {










@@ -56249,12 +56249,10 @@ 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();









@@ -56263,7 +56261,6 @@ 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);









@@ -56276,7 +56273,6 @@ 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



+7
−0




























Original line number
Diff line number
Diff line








@@ -691,6 +691,13 @@ 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/os/Build.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -976,8 +976,7 @@ public class Build {













         * to come. Con permiso, Capitan. The hall is rented, the orchestra















         * engaged. It's now time to see if you can dance.</em>















         */













        public static final int Q = CUR_DEVELOPMENT;



























        public static final int Q = 29;















    }































    /** The type of build, like "user" or "eng". */

































core/java/android/widget/PopupWindow.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -887,6 +887,7 @@ 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() {









@@ -901,6 +902,7 @@ public class PopupWindow {













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















     *















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













     * @removed















     */















    @Deprecated















    public void setClipToScreenEnabled(boolean enabled) {










@@ -988,6 +990,7 @@ 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() {









@@ -1001,6 +1004,7 @@ 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) {

































tools/aapt/SdkConstants.h



+1
−0




























Original line number
Diff line number
Diff line








@@ -44,6 +44,7 @@ enum {













    SDK_O = 26,















    SDK_O_MR1 = 27,















    SDK_P = 28,













    SDK_Q = 29,















};































#endif // H_AAPT_SDK_CONSTANTS