Skip to content

Commit f344497

Browse files
Treehugger RobotGerrit Code Review
authored andcommitted
Merge "Clean up SoonBlockedPrivateApi baseline suppressions" into androidx-main
2 parents 4c548ea + a10c11d commit f344497

File tree

7 files changed

+1282
-2338
lines changed

7 files changed

+1282
-2338
lines changed

core/core/api/current.txt

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2363,15 +2363,15 @@ package androidx.core.view {
23632363
method public static void dispatchNestedScroll(android.view.View, int, int, int, int, int[]?, int, int[]);
23642364
method public static boolean dispatchNestedScroll(android.view.View, int, int, int, int, int[]?, int);
23652365
method public static void dispatchStartTemporaryDetach(android.view.View);
2366-
method public static void enableAccessibleClickableSpanSupport(android.view.View!);
2366+
method public static void enableAccessibleClickableSpanSupport(android.view.View);
23672367
method public static int generateViewId();
23682368
method public static androidx.core.view.AccessibilityDelegateCompat? getAccessibilityDelegate(android.view.View);
23692369
method public static int getAccessibilityLiveRegion(android.view.View);
2370-
method public static androidx.core.view.accessibility.AccessibilityNodeProviderCompat! getAccessibilityNodeProvider(android.view.View);
2371-
method @UiThread public static CharSequence! getAccessibilityPaneTitle(android.view.View!);
2370+
method public static androidx.core.view.accessibility.AccessibilityNodeProviderCompat? getAccessibilityNodeProvider(android.view.View);
2371+
method @UiThread public static CharSequence? getAccessibilityPaneTitle(android.view.View);
23722372
method @Deprecated public static float getAlpha(android.view.View!);
2373-
method public static android.content.res.ColorStateList! getBackgroundTintList(android.view.View);
2374-
method public static android.graphics.PorterDuff.Mode! getBackgroundTintMode(android.view.View);
2373+
method public static android.content.res.ColorStateList? getBackgroundTintList(android.view.View);
2374+
method public static android.graphics.PorterDuff.Mode? getBackgroundTintMode(android.view.View);
23752375
method public static android.graphics.Rect? getClipBounds(android.view.View);
23762376
method public static android.view.Display? getDisplay(android.view.View);
23772377
method public static float getElevation(android.view.View);
@@ -2392,7 +2392,7 @@ package androidx.core.view {
23922392
method @Deprecated public static int getOverScrollMode(android.view.View!);
23932393
method @Px public static int getPaddingEnd(android.view.View);
23942394
method @Px public static int getPaddingStart(android.view.View);
2395-
method public static android.view.ViewParent! getParentForAccessibility(android.view.View);
2395+
method public static android.view.ViewParent? getParentForAccessibility(android.view.View);
23962396
method @Deprecated public static float getPivotX(android.view.View!);
23972397
method @Deprecated public static float getPivotY(android.view.View!);
23982398
method public static androidx.core.view.WindowInsetsCompat? getRootWindowInsets(android.view.View);
@@ -2402,14 +2402,14 @@ package androidx.core.view {
24022402
method @Deprecated public static float getScaleX(android.view.View!);
24032403
method @Deprecated public static float getScaleY(android.view.View!);
24042404
method public static int getScrollIndicators(android.view.View);
2405-
method @UiThread public static final CharSequence? getStateDescription(android.view.View);
2405+
method @UiThread public static CharSequence? getStateDescription(android.view.View);
24062406
method public static java.util.List<android.graphics.Rect!> getSystemGestureExclusionRects(android.view.View);
24072407
method public static String? getTransitionName(android.view.View);
24082408
method @Deprecated public static float getTranslationX(android.view.View!);
24092409
method @Deprecated public static float getTranslationY(android.view.View!);
24102410
method public static float getTranslationZ(android.view.View);
24112411
method public static androidx.core.view.WindowInsetsControllerCompat? getWindowInsetsController(android.view.View);
2412-
method public static int getWindowSystemUiVisibility(android.view.View);
2412+
method @Deprecated public static int getWindowSystemUiVisibility(android.view.View);
24132413
method @Deprecated public static float getX(android.view.View!);
24142414
method @Deprecated public static float getY(android.view.View!);
24152415
method public static float getZ(android.view.View);
@@ -2420,7 +2420,7 @@ package androidx.core.view {
24202420
method public static boolean hasOnClickListeners(android.view.View);
24212421
method public static boolean hasOverlappingRendering(android.view.View);
24222422
method public static boolean hasTransientState(android.view.View);
2423-
method @UiThread public static boolean isAccessibilityHeading(android.view.View!);
2423+
method @UiThread public static boolean isAccessibilityHeading(android.view.View);
24242424
method public static boolean isAttachedToWindow(android.view.View);
24252425
method public static boolean isFocusedByDefault(android.view.View);
24262426
method public static boolean isImportantForAccessibility(android.view.View);
@@ -2432,21 +2432,21 @@ package androidx.core.view {
24322432
method public static boolean isNestedScrollingEnabled(android.view.View);
24332433
method @Deprecated public static boolean isOpaque(android.view.View!);
24342434
method public static boolean isPaddingRelative(android.view.View);
2435-
method @UiThread public static boolean isScreenReaderFocusable(android.view.View!);
2435+
method @UiThread public static boolean isScreenReaderFocusable(android.view.View);
24362436
method @Deprecated public static void jumpDrawablesToCurrentState(android.view.View!);
2437-
method public static android.view.View! keyboardNavigationClusterSearch(android.view.View, android.view.View!, int);
2437+
method public static android.view.View? keyboardNavigationClusterSearch(android.view.View, android.view.View?, int);
24382438
method public static void offsetLeftAndRight(android.view.View, int);
24392439
method public static void offsetTopAndBottom(android.view.View, int);
24402440
method public static androidx.core.view.WindowInsetsCompat onApplyWindowInsets(android.view.View, androidx.core.view.WindowInsetsCompat);
24412441
method @Deprecated public static void onInitializeAccessibilityEvent(android.view.View!, android.view.accessibility.AccessibilityEvent!);
2442-
method public static void onInitializeAccessibilityNodeInfo(android.view.View, androidx.core.view.accessibility.AccessibilityNodeInfoCompat!);
2442+
method public static void onInitializeAccessibilityNodeInfo(android.view.View, androidx.core.view.accessibility.AccessibilityNodeInfoCompat);
24432443
method @Deprecated public static void onPopulateAccessibilityEvent(android.view.View!, android.view.accessibility.AccessibilityEvent!);
2444-
method public static boolean performAccessibilityAction(android.view.View, int, android.os.Bundle!);
2444+
method public static boolean performAccessibilityAction(android.view.View, int, android.os.Bundle?);
24452445
method public static androidx.core.view.ContentInfoCompat? performReceiveContent(android.view.View, androidx.core.view.ContentInfoCompat);
24462446
method public static void postInvalidateOnAnimation(android.view.View);
24472447
method public static void postInvalidateOnAnimation(android.view.View, int, int, int, int);
2448-
method public static void postOnAnimation(android.view.View, Runnable!);
2449-
method public static void postOnAnimationDelayed(android.view.View, Runnable!, long);
2448+
method public static void postOnAnimation(android.view.View, Runnable);
2449+
method public static void postOnAnimationDelayed(android.view.View, Runnable, long);
24502450
method public static void removeAccessibilityAction(android.view.View, int);
24512451
method public static void removeOnUnhandledKeyEventListener(android.view.View, androidx.core.view.ViewCompat.OnUnhandledKeyEventListenerCompat);
24522452
method public static void replaceAccessibilityAction(android.view.View, androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat, CharSequence?, androidx.core.view.accessibility.AccessibilityViewCommand?);
@@ -2455,18 +2455,18 @@ package androidx.core.view {
24552455
method @Deprecated public static int resolveSizeAndState(int, int, int);
24562456
method public static boolean restoreDefaultFocus(android.view.View);
24572457
method public static void saveAttributeDataForStyleable(android.view.View, android.content.Context, int[], android.util.AttributeSet?, android.content.res.TypedArray, int, int);
2458-
method public static void setAccessibilityDelegate(android.view.View, androidx.core.view.AccessibilityDelegateCompat!);
2459-
method @UiThread public static void setAccessibilityHeading(android.view.View!, boolean);
2458+
method public static void setAccessibilityDelegate(android.view.View, androidx.core.view.AccessibilityDelegateCompat?);
2459+
method @UiThread public static void setAccessibilityHeading(android.view.View, boolean);
24602460
method public static void setAccessibilityLiveRegion(android.view.View, int);
2461-
method @UiThread public static void setAccessibilityPaneTitle(android.view.View!, CharSequence!);
2461+
method @UiThread public static void setAccessibilityPaneTitle(android.view.View, CharSequence?);
24622462
method @Deprecated public static void setActivated(android.view.View!, boolean);
24632463
method @Deprecated public static void setAlpha(android.view.View!, @FloatRange(from=0.0, to=1.0) float);
24642464
method public static void setAutofillHints(android.view.View, java.lang.String!...);
24652465
method public static void setBackground(android.view.View, android.graphics.drawable.Drawable?);
2466-
method public static void setBackgroundTintList(android.view.View, android.content.res.ColorStateList!);
2467-
method public static void setBackgroundTintMode(android.view.View, android.graphics.PorterDuff.Mode!);
2466+
method public static void setBackgroundTintList(android.view.View, android.content.res.ColorStateList?);
2467+
method public static void setBackgroundTintMode(android.view.View, android.graphics.PorterDuff.Mode?);
24682468
method @Deprecated public static void setChildrenDrawingOrderEnabled(android.view.ViewGroup!, boolean);
2469-
method public static void setClipBounds(android.view.View, android.graphics.Rect!);
2469+
method public static void setClipBounds(android.view.View, android.graphics.Rect?);
24702470
method public static void setElevation(android.view.View, float);
24712471
method @Deprecated public static void setFitsSystemWindows(android.view.View!, boolean);
24722472
method public static void setFocusedByDefault(android.view.View, boolean);
@@ -2475,7 +2475,7 @@ package androidx.core.view {
24752475
method public static void setImportantForAutofill(android.view.View, int);
24762476
method public static void setKeyboardNavigationCluster(android.view.View, boolean);
24772477
method public static void setLabelFor(android.view.View, @IdRes int);
2478-
method public static void setLayerPaint(android.view.View, android.graphics.Paint!);
2478+
method public static void setLayerPaint(android.view.View, android.graphics.Paint?);
24792479
method @Deprecated public static void setLayerType(android.view.View!, int, android.graphics.Paint!);
24802480
method public static void setLayoutDirection(android.view.View, int);
24812481
method public static void setNestedScrollingEnabled(android.view.View, boolean);
@@ -2486,33 +2486,33 @@ package androidx.core.view {
24862486
method public static void setPaddingRelative(android.view.View, @Px int, @Px int, @Px int, @Px int);
24872487
method @Deprecated public static void setPivotX(android.view.View!, float);
24882488
method @Deprecated public static void setPivotY(android.view.View!, float);
2489-
method public static void setPointerIcon(android.view.View, androidx.core.view.PointerIconCompat!);
2489+
method public static void setPointerIcon(android.view.View, androidx.core.view.PointerIconCompat?);
24902490
method @Deprecated public static void setRotation(android.view.View!, float);
24912491
method @Deprecated public static void setRotationX(android.view.View!, float);
24922492
method @Deprecated public static void setRotationY(android.view.View!, float);
24932493
method @Deprecated public static void setSaveFromParentEnabled(android.view.View!, boolean);
24942494
method @Deprecated public static void setScaleX(android.view.View!, float);
24952495
method @Deprecated public static void setScaleY(android.view.View!, float);
2496-
method @UiThread public static void setScreenReaderFocusable(android.view.View!, boolean);
2496+
method @UiThread public static void setScreenReaderFocusable(android.view.View, boolean);
24972497
method public static void setScrollIndicators(android.view.View, int);
24982498
method public static void setScrollIndicators(android.view.View, int, int);
24992499
method @UiThread public static void setStateDescription(android.view.View, CharSequence?);
25002500
method public static void setSystemGestureExclusionRects(android.view.View, java.util.List<android.graphics.Rect!>);
25012501
method public static void setTooltipText(android.view.View, CharSequence?);
2502-
method public static void setTransitionName(android.view.View, String!);
2502+
method public static void setTransitionName(android.view.View, String?);
25032503
method @Deprecated public static void setTranslationX(android.view.View!, float);
25042504
method @Deprecated public static void setTranslationY(android.view.View!, float);
25052505
method public static void setTranslationZ(android.view.View, float);
25062506
method public static void setWindowInsetsAnimationCallback(android.view.View, androidx.core.view.WindowInsetsAnimationCompat.Callback?);
25072507
method @Deprecated public static void setX(android.view.View!, float);
25082508
method @Deprecated public static void setY(android.view.View!, float);
25092509
method public static void setZ(android.view.View, float);
2510-
method public static boolean startDragAndDrop(android.view.View, android.content.ClipData!, android.view.View.DragShadowBuilder!, Object!, int);
2510+
method public static boolean startDragAndDrop(android.view.View, android.content.ClipData?, android.view.View.DragShadowBuilder, Object?, int);
25112511
method public static boolean startNestedScroll(android.view.View, int);
25122512
method public static boolean startNestedScroll(android.view.View, int, int);
25132513
method public static void stopNestedScroll(android.view.View);
25142514
method public static void stopNestedScroll(android.view.View, int);
2515-
method public static void updateDragShadow(android.view.View, android.view.View.DragShadowBuilder!);
2515+
method public static void updateDragShadow(android.view.View, android.view.View.DragShadowBuilder);
25162516
field public static final int ACCESSIBILITY_LIVE_REGION_ASSERTIVE = 2; // 0x2
25172517
field public static final int ACCESSIBILITY_LIVE_REGION_NONE = 0; // 0x0
25182518
field public static final int ACCESSIBILITY_LIVE_REGION_POLITE = 1; // 0x1
@@ -2548,7 +2548,7 @@ package androidx.core.view {
25482548
}
25492549

25502550
public static interface ViewCompat.OnUnhandledKeyEventListenerCompat {
2551-
method public boolean onUnhandledKeyEvent(android.view.View!, android.view.KeyEvent!);
2551+
method public boolean onUnhandledKeyEvent(android.view.View, android.view.KeyEvent);
25522552
}
25532553

25542554
public final class ViewConfigurationCompat {

0 commit comments

Comments
 (0)