Revert "RESTRICT AUTOMERGE Removing deprecated APIs added to Q"
This reverts commit f6ed8afa405dfae445a16f7433e4d8a9f20115b9.
Reason for revert: QT SDK Finalization. Will be merged again on/after May 13th
Bug: 129975435
Change-Id: If94098b7cc9cf75cf9782d2b70e01881f9c40430
diff --git a/api/current.txt b/api/current.txt
index 9b8ea93..8b24826 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -56249,10 +56249,12 @@
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();
@@ -56261,6 +56263,7 @@
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);
@@ -56273,6 +56276,7 @@
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);
diff --git a/api/removed.txt b/api/removed.txt
index 536eba1..ab5e7e5 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -691,13 +691,6 @@
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);
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java
index 3779779..20fc0b1 100644
--- a/core/java/android/widget/PopupWindow.java
+++ b/core/java/android/widget/PopupWindow.java
@@ -887,7 +887,6 @@
*
* @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 @@
* the {@link #update()} methods.</p>
*
* @deprecated Use {@link #setIsClippedToScreen(boolean)} instead
- * @removed
*/
@Deprecated
public void setClipToScreenEnabled(boolean enabled) {
@@ -990,7 +988,6 @@
* @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 @@
*
* @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) {