Merge "Add @TestApi annotation to a few @hide APIs that were used in CTS." (735dd9ad) · Commits · e / os / android_frameworks_base

api/test-current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -1462,13 +1462,21 @@ package android.view {
		method public android.view.View getTooltipView();
		method public static boolean isDefaultFocusHighlightEnabled();
		method public boolean isDefaultFocusHighlightNeeded(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
		method protected void resetResolvedDrawables();
		method public void resetResolvedLayoutDirection();
		method public void resetResolvedPadding();
		method public void resetResolvedTextAlignment();
		method public void resetResolvedTextDirection();
		method public void resetRtlProperties();
		method public boolean restoreFocusInCluster(int);
		method public boolean restoreFocusNotInCluster();
		method public void setAutofilled(boolean);
		method public final void setFocusedInCluster();
		method public void setIsRootNamespace(boolean);
		}

		public class ViewConfiguration {
		method public long getDeviceGlobalActionKeyTimeout();
		method public static int getHoverTooltipHideShortTimeout();
		method public static int getHoverTooltipHideTimeout();
		method public static int getHoverTooltipShowTimeout();

config/hiddenapi-light-greylist.txt

+0 −13

Original line number	Diff line number	Diff line
		@@ -5223,12 +5223,6 @@ Landroid/view/View;->removePerformClickCallback()V
		Landroid/view/View;->requestAccessibilityFocus()Z
		Landroid/view/View;->resetDisplayList()V
		Landroid/view/View;->resetPaddingToInitialValues()V
		Landroid/view/View;->resetResolvedDrawables()V
		Landroid/view/View;->resetResolvedLayoutDirection()V
		Landroid/view/View;->resetResolvedPadding()V
		Landroid/view/View;->resetResolvedTextAlignment()V
		Landroid/view/View;->resetResolvedTextDirection()V
		Landroid/view/View;->resetRtlProperties()V
		Landroid/view/View;->resolvePadding()V
		Landroid/view/View;->setAlphaNoInvalidation(F)Z
		Landroid/view/View;->setAnimationMatrix(Landroid/graphics/Matrix;)V
		@@ -5236,7 +5230,6 @@ Landroid/view/View;->setAssistBlocked(Z)V
		Landroid/view/View;->setDisabledSystemUiVisibility(I)V
		Landroid/view/View;->setFlags(II)V
		Landroid/view/View;->setFrame(IIII)Z
		Landroid/view/View;->setIsRootNamespace(Z)V
		Landroid/view/View;->setLeftTopRightBottom(IIII)V
		Landroid/view/View;->setTagInternal(ILjava/lang/Object;)V
		Landroid/view/View;->setTransitionAlpha(F)V
		@@ -5250,7 +5243,6 @@ Landroid/view/View;->toLocalMotionEvent(Landroid/view/MotionEvent;)Z
		Landroid/view/View;->transformMatrixToGlobal(Landroid/graphics/Matrix;)V
		Landroid/view/View;->transformMatrixToLocal(Landroid/graphics/Matrix;)V
		Landroid/view/View;->updateDisplayListIfDirty()Landroid/view/RenderNode;
		Landroid/view/ViewConfiguration;->getDeviceGlobalActionKeyTimeout()J
		Landroid/view/ViewConfiguration;->getDoubleTapMinTime()I
		Landroid/view/ViewConfiguration;->getDoubleTapSlop()I
		Landroid/view/ViewConfiguration;->getHoverTapSlop()I
		@@ -5299,11 +5291,6 @@ Landroid/view/ViewGroup;->offsetChildrenTopAndBottom(I)V
		Landroid/view/ViewGroup;->onChildVisibilityChanged(Landroid/view/View;II)V
		Landroid/view/ViewGroup;->onInitializeAccessibilityNodeInfoInternal(Landroid/view/accessibility/AccessibilityNodeInfo;)V
		Landroid/view/ViewGroup;->removeTransientView(Landroid/view/View;)V
		Landroid/view/ViewGroup;->resetResolvedDrawables()V
		Landroid/view/ViewGroup;->resetResolvedLayoutDirection()V
		Landroid/view/ViewGroup;->resetResolvedPadding()V
		Landroid/view/ViewGroup;->resetResolvedTextAlignment()V
		Landroid/view/ViewGroup;->resetResolvedTextDirection()V
		Landroid/view/ViewGroup;->resolvePadding()V
		Landroid/view/ViewGroup;->suppressLayout(Z)V
		Landroid/view/ViewGroup;->transformPointToViewLocal([FLandroid/view/View;)V

core/java/android/view/View.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -17871,6 +17871,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*
		* @hide
		*/
		@TestApi
		public void resetRtlProperties() {
		resetResolvedLayoutDirection();
		resetResolvedTextDirection();
		@@ -18052,6 +18053,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*
		* @hide
		*/
		@TestApi
		public void resetResolvedLayoutDirection() {
		// Reset the current resolved bits
		mPrivateFlags2 &= ~PFLAG2_LAYOUT_DIRECTION_RESOLVED_MASK;
		@@ -18151,6 +18153,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*
		* @hide
		*/
		@TestApi
		public void resetResolvedPadding() {
		resetResolvedPaddingInternal();
		}
		@@ -21021,6 +21024,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		/**
		* @hide
		*/
		@TestApi
		protected void resetResolvedDrawables() {
		resetResolvedDrawablesInternal();
		}
		@@ -22802,6 +22806,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @param isRoot true if the view belongs to the root namespace, false
		* otherwise
		*/
		@TestApi
		public void setIsRootNamespace(boolean isRoot) {
		if (isRoot) {
		mPrivateFlags \|= PFLAG_IS_ROOT_NAMESPACE;
		@@ -25023,6 +25028,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*
		* @hide
		*/
		@TestApi
		public void resetResolvedTextDirection() {
		// Reset any previous text direction resolution
		mPrivateFlags2 &= ~(PFLAG2_TEXT_DIRECTION_RESOLVED \| PFLAG2_TEXT_DIRECTION_RESOLVED_MASK);
		@@ -25260,6 +25266,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*
		* @hide
		*/
		@TestApi
		public void resetResolvedTextAlignment() {
		// Reset any previous text alignment resolution
		mPrivateFlags2 &= ~(PFLAG2_TEXT_ALIGNMENT_RESOLVED \| PFLAG2_TEXT_ALIGNMENT_RESOLVED_MASK);

core/java/android/view/ViewConfiguration.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -857,6 +857,7 @@ public class ViewConfiguration {
		* the global actions dialog.
		* @hide
		*/
		@TestApi
		public long getDeviceGlobalActionKeyTimeout() {
		return mGlobalActionsKeyTimeout;
		}

core/java/android/view/ViewGroup.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -7345,6 +7345,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		/**
		* @hide
		*/
		@TestApi
		@Override
		public void resetResolvedLayoutDirection() {
		super.resetResolvedLayoutDirection();
		@@ -7361,6 +7362,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		/**
		* @hide
		*/
		@TestApi
		@Override
		public void resetResolvedTextDirection() {
		super.resetResolvedTextDirection();
		@@ -7377,6 +7379,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		/**
		* @hide
		*/
		@TestApi
		@Override
		public void resetResolvedTextAlignment() {
		super.resetResolvedTextAlignment();
		@@ -7393,6 +7396,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		/**
		* @hide
		*/
		@TestApi
		@Override
		public void resetResolvedPadding() {
		super.resetResolvedPadding();
		@@ -7409,6 +7413,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		/**
		* @hide
		*/
		@TestApi
		@Override
		protected void resetResolvedDrawables() {
		super.resetResolvedDrawables();