Modifications to AndroidX for compatibility with SDK drop in same topic.
Bug:131836680
Test: ./gradlew checkApi
Change-Id: Ib46127c1f20443d0f9d03e85a0a01bc7a4efad86
diff --git a/appcompat/resources/api/1.1.0-alpha06.txt b/appcompat/resources/api/1.1.0-alpha06.txt
index 7f67297..990b059 100644
--- a/appcompat/resources/api/1.1.0-alpha06.txt
+++ b/appcompat/resources/api/1.1.0-alpha06.txt
@@ -28,7 +28,6 @@
method public void setDither(boolean);
method public void setEnterFadeDuration(int);
method public void setExitFadeDuration(int);
- method public void setTintMode(android.graphics.PorterDuff.Mode);
method public void unscheduleDrawable(android.graphics.drawable.Drawable, Runnable);
}
diff --git a/appcompat/resources/api/current.txt b/appcompat/resources/api/current.txt
index 7f67297..990b059 100644
--- a/appcompat/resources/api/current.txt
+++ b/appcompat/resources/api/current.txt
@@ -28,7 +28,6 @@
method public void setDither(boolean);
method public void setEnterFadeDuration(int);
method public void setExitFadeDuration(int);
- method public void setTintMode(android.graphics.PorterDuff.Mode);
method public void unscheduleDrawable(android.graphics.drawable.Drawable, Runnable);
}
diff --git a/appcompat/src/main/java/androidx/appcompat/widget/ListPopupWindow.java b/appcompat/src/main/java/androidx/appcompat/widget/ListPopupWindow.java
index 72ef8eb..fe4ccd8 100644
--- a/appcompat/src/main/java/androidx/appcompat/widget/ListPopupWindow.java
+++ b/appcompat/src/main/java/androidx/appcompat/widget/ListPopupWindow.java
@@ -1438,7 +1438,7 @@
}
}
} else {
- mPopup.setClipToScreenEnabled(clip);
+ mPopup.setIsClippedToScreen(clip);
}
}
diff --git a/core/src/main/java/androidx/core/app/NotificationCompat.java b/core/src/main/java/androidx/core/app/NotificationCompat.java
index 1c0ee1d..c338d6c 100644
--- a/core/src/main/java/androidx/core/app/NotificationCompat.java
+++ b/core/src/main/java/androidx/core/app/NotificationCompat.java
@@ -5355,7 +5355,7 @@
.setDeleteIntent(compatMetadata.getDeleteIntent())
.setIcon(compatMetadata.getIcon().toIcon())
.setIntent(compatMetadata.getIntent())
- .setSuppressInitialNotification(
+ .setSuppressNotification(
compatMetadata.getSuppressInitialNotification());
if (compatMetadata.getDesiredHeight() != 0) {
@@ -5391,7 +5391,7 @@
.setIcon(IconCompat.createFromIcon(platformMetadata.getIcon()))
.setIntent(platformMetadata.getIntent())
.setSuppressInitialNotification(
- platformMetadata.getSuppressInitialNotification());
+ platformMetadata.isNotificationSuppressed());
if (platformMetadata.getDesiredHeight() != 0) {
compatBuilder.setDesiredHeight(platformMetadata.getDesiredHeight());
diff --git a/graphics/drawable/animated/api/1.1.0-alpha03.txt b/graphics/drawable/animated/api/1.1.0-alpha03.txt
index 8ad4321..70c9c23 100644
--- a/graphics/drawable/animated/api/1.1.0-alpha03.txt
+++ b/graphics/drawable/animated/api/1.1.0-alpha03.txt
@@ -26,7 +26,6 @@
method public void setAlpha(int);
method public void setColorFilter(android.graphics.ColorFilter!);
method public void setColorFilter(int, android.graphics.PorterDuff.Mode!);
- method public void setTintMode(android.graphics.PorterDuff.Mode!);
method public void start();
method public void stop();
method public boolean unregisterAnimationCallback(androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback);
diff --git a/graphics/drawable/animated/api/current.txt b/graphics/drawable/animated/api/current.txt
index 8ad4321..70c9c23 100644
--- a/graphics/drawable/animated/api/current.txt
+++ b/graphics/drawable/animated/api/current.txt
@@ -26,7 +26,6 @@
method public void setAlpha(int);
method public void setColorFilter(android.graphics.ColorFilter!);
method public void setColorFilter(int, android.graphics.PorterDuff.Mode!);
- method public void setTintMode(android.graphics.PorterDuff.Mode!);
method public void start();
method public void stop();
method public boolean unregisterAnimationCallback(androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback);
diff --git a/graphics/drawable/animated/api/restricted_1.1.0-alpha03.txt b/graphics/drawable/animated/api/restricted_1.1.0-alpha03.txt
index 11970ce..ceab395 100644
--- a/graphics/drawable/animated/api/restricted_1.1.0-alpha03.txt
+++ b/graphics/drawable/animated/api/restricted_1.1.0-alpha03.txt
@@ -1,10 +1,6 @@
// Signature format: 3.0
package androidx.vectordrawable.graphics.drawable {
- public class AnimatedVectorDrawableCompat extends android.graphics.drawable.Drawable implements androidx.vectordrawable.graphics.drawable.Animatable2Compat androidx.core.graphics.drawable.TintAwareDrawable {
- method public void setTintMode(android.graphics.PorterDuff.Mode!);
- }
-
@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class AnimationUtilsCompat {
method public static android.view.animation.Interpolator! loadInterpolator(android.content.Context!, int) throws android.content.res.Resources.NotFoundException;
}
diff --git a/graphics/drawable/animated/api/restricted_current.txt b/graphics/drawable/animated/api/restricted_current.txt
index 11970ce..ceab395 100644
--- a/graphics/drawable/animated/api/restricted_current.txt
+++ b/graphics/drawable/animated/api/restricted_current.txt
@@ -1,10 +1,6 @@
// Signature format: 3.0
package androidx.vectordrawable.graphics.drawable {
- public class AnimatedVectorDrawableCompat extends android.graphics.drawable.Drawable implements androidx.vectordrawable.graphics.drawable.Animatable2Compat androidx.core.graphics.drawable.TintAwareDrawable {
- method public void setTintMode(android.graphics.PorterDuff.Mode!);
- }
-
@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class AnimationUtilsCompat {
method public static android.view.animation.Interpolator! loadInterpolator(android.content.Context!, int) throws android.content.res.Resources.NotFoundException;
}
diff --git a/graphics/drawable/static/api/1.1.0-alpha03.txt b/graphics/drawable/static/api/1.1.0-alpha03.txt
index fb0b767..34cf297 100644
--- a/graphics/drawable/static/api/1.1.0-alpha03.txt
+++ b/graphics/drawable/static/api/1.1.0-alpha03.txt
@@ -9,7 +9,6 @@
method public void setAlpha(int);
method public void setColorFilter(android.graphics.ColorFilter!);
method public void setColorFilter(int, android.graphics.PorterDuff.Mode!);
- method public void setTintMode(android.graphics.PorterDuff.Mode!);
}
}
diff --git a/graphics/drawable/static/api/current.txt b/graphics/drawable/static/api/current.txt
index fb0b767..34cf297 100644
--- a/graphics/drawable/static/api/current.txt
+++ b/graphics/drawable/static/api/current.txt
@@ -9,7 +9,6 @@
method public void setAlpha(int);
method public void setColorFilter(android.graphics.ColorFilter!);
method public void setColorFilter(int, android.graphics.PorterDuff.Mode!);
- method public void setTintMode(android.graphics.PorterDuff.Mode!);
}
}
diff --git a/graphics/drawable/static/api/restricted_1.1.0-alpha03.txt b/graphics/drawable/static/api/restricted_1.1.0-alpha03.txt
index f3fcded..dadafcd 100644
--- a/graphics/drawable/static/api/restricted_1.1.0-alpha03.txt
+++ b/graphics/drawable/static/api/restricted_1.1.0-alpha03.txt
@@ -3,7 +3,6 @@
public class VectorDrawableCompat extends android.graphics.drawable.Drawable implements androidx.core.graphics.drawable.TintAwareDrawable {
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public float getPixelSize();
- method public void setTintMode(android.graphics.PorterDuff.Mode!);
}
}
diff --git a/graphics/drawable/static/api/restricted_current.txt b/graphics/drawable/static/api/restricted_current.txt
index f3fcded..dadafcd 100644
--- a/graphics/drawable/static/api/restricted_current.txt
+++ b/graphics/drawable/static/api/restricted_current.txt
@@ -3,7 +3,6 @@
public class VectorDrawableCompat extends android.graphics.drawable.Drawable implements androidx.core.graphics.drawable.TintAwareDrawable {
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public float getPixelSize();
- method public void setTintMode(android.graphics.PorterDuff.Mode!);
}
}