Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 028b649f71

Change-Id: Ifa06fa782c807fe282f38b028f33dbb481c0ddcc
This commit is contained in:
Ian Pedowitz
2019-05-15 13:42:34 -07:00
committed by android-build-merger
parent 563abce4ed 028b649f71
commit 164aa62fb2
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -56254,12 +56254,10 @@ 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();
@@ -56268,7 +56266,6 @@ 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);
@@ -56281,7 +56278,6 @@ 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);

7
api/removed.txt
View File

@@ -699,6 +699,13 @@ 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);

4
core/java/android/widget/PopupWindow.java
View File

@@ -887,6 +887,7 @@ 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() {
@@ -901,6 +902,7 @@ 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) {
@@ -988,6 +990,7 @@ 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() {
@@ -1001,6 +1004,7 @@ 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) {