tv-provider: hide setPackageName and remove set/getChannelLogo
Test: ./gradlew support-tv-provider:connectedCheck
Bug: 35857010, Bug: 35856761
Change-Id: Ib3fcd34c2e46d71ae04ef1feed58b2c99dcc3c87
diff --git a/api/26.0.0.txt b/api/26.0.0.txt
index 3d77c5b..e339357 100644
--- a/api/26.0.0.txt
+++ b/api/26.0.0.txt
@@ -1,3 +1,75 @@
+package android.support.animation {
+
+ public abstract class DynamicAnimation<T extends android.support.animation.DynamicAnimation<T>> {
+ method public T addEndListener(android.support.animation.DynamicAnimation.OnAnimationEndListener);
+ method public T addUpdateListener(android.support.animation.DynamicAnimation.OnAnimationUpdateListener);
+ method public void cancel();
+ method public boolean isRunning();
+ method public void removeEndListener(android.support.animation.DynamicAnimation.OnAnimationEndListener);
+ method public void removeUpdateListener(android.support.animation.DynamicAnimation.OnAnimationUpdateListener);
+ method public T setMaxValue(float);
+ method public T setMinValue(float);
+ method public T setStartValue(float);
+ method public T setStartVelocity(float);
+ method public void start();
+ field public static final android.support.animation.DynamicAnimation.ViewProperty ALPHA;
+ field public static final android.support.animation.DynamicAnimation.ViewProperty ROTATION;
+ field public static final android.support.animation.DynamicAnimation.ViewProperty ROTATION_X;
+ field public static final android.support.animation.DynamicAnimation.ViewProperty ROTATION_Y;
+ field public static final android.support.animation.DynamicAnimation.ViewProperty SCALE_X;
+ field public static final android.support.animation.DynamicAnimation.ViewProperty SCALE_Y;
+ field public static final android.support.animation.DynamicAnimation.ViewProperty SCROLL_X;
+ field public static final android.support.animation.DynamicAnimation.ViewProperty SCROLL_Y;
+ field public static final android.support.animation.DynamicAnimation.ViewProperty TRANSLATION_X;
+ field public static final android.support.animation.DynamicAnimation.ViewProperty TRANSLATION_Y;
+ field public static final android.support.animation.DynamicAnimation.ViewProperty TRANSLATION_Z;
+ field public static final android.support.animation.DynamicAnimation.ViewProperty X;
+ field public static final android.support.animation.DynamicAnimation.ViewProperty Y;
+ field public static final android.support.animation.DynamicAnimation.ViewProperty Z;
+ }
+
+ public static abstract interface DynamicAnimation.OnAnimationEndListener {
+ method public abstract void onAnimationEnd(android.support.animation.DynamicAnimation, boolean, float, float);
+ }
+
+ public static abstract interface DynamicAnimation.OnAnimationUpdateListener {
+ method public abstract void onAnimationUpdate(android.support.animation.DynamicAnimation, float, float);
+ }
+
+ public static abstract class DynamicAnimation.ViewProperty {
+ }
+
+ public final class SpringAnimation extends android.support.animation.DynamicAnimation {
+ ctor public SpringAnimation(android.view.View, android.support.animation.DynamicAnimation.ViewProperty);
+ ctor public SpringAnimation(android.view.View, android.support.animation.DynamicAnimation.ViewProperty, float);
+ method public void animateToFinalPosition(float);
+ method public boolean canSkipToEnd();
+ method public android.support.animation.SpringForce getSpring();
+ method public android.support.animation.SpringAnimation setSpring(android.support.animation.SpringForce);
+ method public void skipToEnd();
+ }
+
+ public final class SpringForce {
+ ctor public SpringForce();
+ ctor public SpringForce(float);
+ method public float getDampingRatio();
+ method public float getFinalPosition();
+ method public float getStiffness();
+ method public android.support.animation.SpringForce setDampingRatio(float);
+ method public android.support.animation.SpringForce setFinalPosition(float);
+ method public android.support.animation.SpringForce setStiffness(float);
+ field public static final float DAMPING_RATIO_HIGH_BOUNCY = 0.2f;
+ field public static final float DAMPING_RATIO_LOW_BOUNCY = 0.75f;
+ field public static final float DAMPING_RATIO_MEDIUM_BOUNCY = 0.5f;
+ field public static final float DAMPING_RATIO_NO_BOUNCY = 1.0f;
+ field public static final float STIFFNESS_HIGH = 10000.0f;
+ field public static final float STIFFNESS_LOW = 200.0f;
+ field public static final float STIFFNESS_MEDIUM = 1500.0f;
+ field public static final float STIFFNESS_VERY_LOW = 50.0f;
+ }
+
+}
+
package android.support.app.recommendation {
public final class ContentRecommendation {
@@ -869,16 +941,34 @@
package android.support.graphics.drawable {
- public class AnimatedVectorDrawableCompat extends android.support.graphics.drawable.VectorDrawableCommon {
+ public abstract interface Animatable2Compat {
+ method public abstract void clearAnimationCallbacks();
+ method public abstract void registerAnimationCallback(android.support.graphics.drawable.Animatable2Compat.AnimationCallback);
+ method public abstract boolean unregisterAnimationCallback(android.support.graphics.drawable.Animatable2Compat.AnimationCallback);
+ }
+
+ public static abstract class Animatable2Compat.AnimationCallback {
+ ctor public Animatable2Compat.AnimationCallback();
+ method public void onAnimationEnd(android.graphics.drawable.Drawable);
+ method public void onAnimationStart(android.graphics.drawable.Drawable);
+ }
+
+ public class AnimatedVectorDrawableCompat extends android.support.graphics.drawable.VectorDrawableCommon implements android.support.graphics.drawable.Animatable2Compat {
+ method public void clearAnimationCallbacks();
+ method public static void clearAnimationCallbacks(android.graphics.drawable.Drawable);
method public static android.support.graphics.drawable.AnimatedVectorDrawableCompat create(android.content.Context, int);
method public static android.support.graphics.drawable.AnimatedVectorDrawableCompat createFromXmlInner(android.content.Context, android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
method public void draw(android.graphics.Canvas);
method public int getOpacity();
method public boolean isRunning();
+ method public void registerAnimationCallback(android.support.graphics.drawable.Animatable2Compat.AnimationCallback);
+ method public static void registerAnimationCallback(android.graphics.drawable.Drawable, android.support.graphics.drawable.Animatable2Compat.AnimationCallback);
method public void setAlpha(int);
method public void setColorFilter(android.graphics.ColorFilter);
method public void start();
method public void stop();
+ method public boolean unregisterAnimationCallback(android.support.graphics.drawable.Animatable2Compat.AnimationCallback);
+ method public static boolean unregisterAnimationCallback(android.graphics.drawable.Drawable, android.support.graphics.drawable.Animatable2Compat.AnimationCallback);
}
abstract class VectorDrawableCommon extends android.graphics.drawable.Drawable {
@@ -1102,7 +1192,6 @@
method public android.net.Uri getAppLinkIntentUri();
method public android.net.Uri getAppLinkPosterArtUri();
method public java.lang.String getAppLinkText();
- method public java.lang.String getChannelLogo();
method public java.lang.String getDescription();
method public java.lang.String getDisplayName();
method public java.lang.String getDisplayNumber();
@@ -1135,7 +1224,6 @@
method public android.support.media.tv.Channel.Builder setAppLinkIntentUri(android.net.Uri);
method public android.support.media.tv.Channel.Builder setAppLinkPosterArtUri(android.net.Uri);
method public android.support.media.tv.Channel.Builder setAppLinkText(java.lang.String);
- method public android.support.media.tv.Channel.Builder setChannelLogo(java.lang.String);
method public android.support.media.tv.Channel.Builder setDescription(java.lang.String);
method public android.support.media.tv.Channel.Builder setDisplayName(java.lang.String);
method public android.support.media.tv.Channel.Builder setDisplayNumber(java.lang.String);
@@ -1148,7 +1236,6 @@
method public android.support.media.tv.Channel.Builder setInternalProviderFlag4(long);
method public android.support.media.tv.Channel.Builder setNetworkAffiliation(java.lang.String);
method public android.support.media.tv.Channel.Builder setOriginalNetworkId(int);
- method public android.support.media.tv.Channel.Builder setPackageName(java.lang.String);
method public android.support.media.tv.Channel.Builder setSearchable(boolean);
method public android.support.media.tv.Channel.Builder setServiceId(int);
method public android.support.media.tv.Channel.Builder setServiceType(java.lang.String);
@@ -1589,12 +1676,25 @@
package android.support.transition {
+ public class ArcMotion extends android.support.transition.PathMotion {
+ ctor public ArcMotion();
+ method public float getMaximumAngle();
+ method public float getMinimumHorizontalAngle();
+ method public float getMinimumVerticalAngle();
+ method public android.graphics.Path getPath(float, float, float, float);
+ method public void setMaximumAngle(float);
+ method public void setMinimumHorizontalAngle(float);
+ method public void setMinimumVerticalAngle(float);
+ }
+
public class AutoTransition extends android.support.transition.TransitionSet {
ctor public AutoTransition();
+ ctor public AutoTransition(android.content.Context, android.util.AttributeSet);
}
public class ChangeBounds extends android.support.transition.Transition {
ctor public ChangeBounds();
+ ctor public ChangeBounds(android.content.Context, android.util.AttributeSet);
method public void captureEndValues(android.support.transition.TransitionValues);
method public void captureStartValues(android.support.transition.TransitionValues);
method public void setResizeClip(boolean);
@@ -1603,10 +1703,24 @@
public class Fade extends android.support.transition.Visibility {
ctor public Fade(int);
ctor public Fade();
+ ctor public Fade(android.content.Context, android.util.AttributeSet);
field public static final int IN = 1; // 0x1
field public static final int OUT = 2; // 0x2
}
+ public abstract class PathMotion {
+ ctor public PathMotion();
+ method public abstract android.graphics.Path getPath(float, float, float, float);
+ }
+
+ public class PatternPathMotion extends android.support.transition.PathMotion {
+ ctor public PatternPathMotion();
+ ctor public PatternPathMotion(android.graphics.Path);
+ method public android.graphics.Path getPath(float, float, float, float);
+ method public android.graphics.Path getPatternPath();
+ method public void setPatternPath(android.graphics.Path);
+ }
+
public class Scene {
ctor public Scene(android.view.ViewGroup);
ctor public Scene(android.view.ViewGroup, android.view.View);
@@ -1620,6 +1734,7 @@
public abstract class Transition {
ctor public Transition();
+ ctor public Transition(android.content.Context, android.util.AttributeSet);
method public android.support.transition.Transition addListener(android.support.transition.Transition.TransitionListener);
method public android.support.transition.Transition addTarget(android.view.View);
method public android.support.transition.Transition addTarget(int);
@@ -1639,6 +1754,7 @@
method public long getDuration();
method public android.animation.TimeInterpolator getInterpolator();
method public java.lang.String getName();
+ method public android.support.transition.PathMotion getPathMotion();
method public long getStartDelay();
method public java.util.List<java.lang.Integer> getTargetIds();
method public java.util.List<java.lang.String> getTargetNames();
@@ -1654,6 +1770,7 @@
method public android.support.transition.Transition setDuration(long);
method public android.support.transition.Transition setInterpolator(android.animation.TimeInterpolator);
method public void setMatchOrder(int...);
+ method public void setPathMotion(android.support.transition.PathMotion);
method public android.support.transition.Transition setStartDelay(long);
field public static final int MATCH_ID = 3; // 0x3
field public static final int MATCH_INSTANCE = 1; // 0x1
@@ -1669,6 +1786,12 @@
method public abstract void onTransitionStart(android.support.transition.Transition);
}
+ public class TransitionInflater {
+ method public static android.support.transition.TransitionInflater from(android.content.Context);
+ method public android.support.transition.Transition inflateTransition(int);
+ method public android.support.transition.TransitionManager inflateTransitionManager(int, android.view.ViewGroup);
+ }
+
public class TransitionManager {
ctor public TransitionManager();
method public static void beginDelayedTransition(android.view.ViewGroup);
@@ -1682,6 +1805,7 @@
public class TransitionSet extends android.support.transition.Transition {
ctor public TransitionSet();
+ ctor public TransitionSet(android.content.Context, android.util.AttributeSet);
method public android.support.transition.TransitionSet addTransition(android.support.transition.Transition);
method public void captureEndValues(android.support.transition.TransitionValues);
method public void captureStartValues(android.support.transition.TransitionValues);
@@ -1702,11 +1826,18 @@
public abstract class Visibility extends android.support.transition.Transition {
ctor public Visibility();
+ ctor public Visibility(android.content.Context, android.util.AttributeSet);
method public void captureEndValues(android.support.transition.TransitionValues);
method public void captureStartValues(android.support.transition.TransitionValues);
+ method public int getMode();
method public boolean isVisible(android.support.transition.TransitionValues);
method public android.animation.Animator onAppear(android.view.ViewGroup, android.support.transition.TransitionValues, int, android.support.transition.TransitionValues, int);
+ method public android.animation.Animator onAppear(android.view.ViewGroup, android.view.View, android.support.transition.TransitionValues, android.support.transition.TransitionValues);
method public android.animation.Animator onDisappear(android.view.ViewGroup, android.support.transition.TransitionValues, int, android.support.transition.TransitionValues, int);
+ method public android.animation.Animator onDisappear(android.view.ViewGroup, android.view.View, android.support.transition.TransitionValues, android.support.transition.TransitionValues);
+ method public void setMode(int);
+ field public static final int MODE_IN = 1; // 0x1
+ field public static final int MODE_OUT = 2; // 0x2
}
}
@@ -9023,6 +9154,7 @@
method public android.support.v7.graphics.drawable.DrawerArrowDrawable getDrawerArrowDrawable();
method public android.view.View.OnClickListener getToolbarNavigationClickListener();
method public boolean isDrawerIndicatorEnabled();
+ method public boolean isDrawerSlideAnimationEnabled();
method public void onConfigurationChanged(android.content.res.Configuration);
method public void onDrawerClosed(android.view.View);
method public void onDrawerOpened(android.view.View);
@@ -9031,6 +9163,7 @@
method public boolean onOptionsItemSelected(android.view.MenuItem);
method public void setDrawerArrowDrawable(android.support.v7.graphics.drawable.DrawerArrowDrawable);
method public void setDrawerIndicatorEnabled(boolean);
+ method public void setDrawerSlideAnimationEnabled(boolean);
method public void setHomeAsUpIndicator(android.graphics.drawable.Drawable);
method public void setHomeAsUpIndicator(int);
method public void setToolbarNavigationClickListener(android.view.View.OnClickListener);
@@ -10689,7 +10822,8 @@
method public int findLastVisibleItemPosition();
method public android.support.v7.widget.RecyclerView.LayoutParams generateDefaultLayoutParams();
method protected int getExtraLayoutSpace(android.support.v7.widget.RecyclerView.State);
- method public int getInitialItemPrefetchCount();
+ method public deprecated int getInitialItemPrefetchCount();
+ method public int getInitialPrefetchItemCount();
method public int getOrientation();
method public boolean getRecycleChildrenOnDetach();
method public boolean getReverseLayout();
diff --git a/api/current.txt b/api/current.txt
index 8d12577..e339357 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1192,7 +1192,6 @@
method public android.net.Uri getAppLinkIntentUri();
method public android.net.Uri getAppLinkPosterArtUri();
method public java.lang.String getAppLinkText();
- method public java.lang.String getChannelLogo();
method public java.lang.String getDescription();
method public java.lang.String getDisplayName();
method public java.lang.String getDisplayNumber();
@@ -1225,7 +1224,6 @@
method public android.support.media.tv.Channel.Builder setAppLinkIntentUri(android.net.Uri);
method public android.support.media.tv.Channel.Builder setAppLinkPosterArtUri(android.net.Uri);
method public android.support.media.tv.Channel.Builder setAppLinkText(java.lang.String);
- method public android.support.media.tv.Channel.Builder setChannelLogo(java.lang.String);
method public android.support.media.tv.Channel.Builder setDescription(java.lang.String);
method public android.support.media.tv.Channel.Builder setDisplayName(java.lang.String);
method public android.support.media.tv.Channel.Builder setDisplayNumber(java.lang.String);
@@ -1238,7 +1236,6 @@
method public android.support.media.tv.Channel.Builder setInternalProviderFlag4(long);
method public android.support.media.tv.Channel.Builder setNetworkAffiliation(java.lang.String);
method public android.support.media.tv.Channel.Builder setOriginalNetworkId(int);
- method public android.support.media.tv.Channel.Builder setPackageName(java.lang.String);
method public android.support.media.tv.Channel.Builder setSearchable(boolean);
method public android.support.media.tv.Channel.Builder setServiceId(int);
method public android.support.media.tv.Channel.Builder setServiceType(java.lang.String);
diff --git a/tv-provider/src/android/support/media/tv/Channel.java b/tv-provider/src/android/support/media/tv/Channel.java
index 5e158e2..2549112 100644
--- a/tv-provider/src/android/support/media/tv/Channel.java
+++ b/tv-provider/src/android/support/media/tv/Channel.java
@@ -54,7 +54,6 @@
private final String mDisplayNumber;
private final String mDisplayName;
private final String mDescription;
- private final String mChannelLogo;
private final String mVideoFormat;
private final int mOriginalNetworkId;
private final int mTransportStreamId;
@@ -91,7 +90,6 @@
mAppLinkIconUri = builder.mAppLinkIconUri;
mAppLinkPosterArtUri = builder.mAppLinkPosterArtUri;
mAppLinkIntentUri = builder.mAppLinkIntentUri;
- mChannelLogo = builder.mChannelLogo;
mInternalProviderData = builder.mInternalProviderData;
mNetworkAffiliation = builder.mNetworkAffiliation;
mSearchable = builder.mSearchable;
@@ -224,13 +222,6 @@
/**
- * @return The value of {@link Channels.Logo} for the channel.
- */
- public String getChannelLogo() {
- return mChannelLogo;
- }
-
- /**
* @return The value of {@link Channels#COLUMN_NETWORK_AFFILIATION} for the channel.
*/
public String getNetworkAffiliation() {
@@ -309,7 +300,6 @@
+ ", displayNumber=" + mDisplayNumber
+ ", displayName=" + mDisplayName
+ ", description=" + mDescription
- + ", channelLogo=" + mChannelLogo
+ ", videoFormat=" + mVideoFormat
+ ", appLinkText=" + mAppLinkText + "}";
}
@@ -580,7 +570,6 @@
private String mDisplayNumber;
private String mDisplayName;
private String mDescription;
- private String mChannelLogo;
private String mVideoFormat;
private int mOriginalNetworkId = INVALID_INTEGER_VALUE;
private int mTransportStreamId;
@@ -620,7 +609,6 @@
mAppLinkIconUri = other.mAppLinkIconUri;
mAppLinkPosterArtUri = other.mAppLinkPosterArtUri;
mAppLinkIntentUri = other.mAppLinkIntentUri;
- mChannelLogo = other.mChannelLogo;
mInternalProviderData = other.mInternalProviderData;
mNetworkAffiliation = other.mNetworkAffiliation;
mSearchable = other.mSearchable;
@@ -648,8 +636,10 @@
*
* @param packageName The value of {@link Channels#COLUMN_PACKAGE_NAME} for the channel.
* @return This Builder object to allow for chaining of calls to builder methods.
+ * @hide
*/
- public Builder setPackageName(String packageName) {
+ @RestrictTo(LIBRARY_GROUP)
+ Builder setPackageName(String packageName) {
mPackageName = packageName;
return this;
}
@@ -710,18 +700,6 @@
}
/**
- * Sets the logo of the channel.
- *
- * @param channelLogo The Uri corresponding to the logo for the channel.
- * @return This Builder object to allow for chaining of calls to builder methods.
- * @see Channels.Logo
- */
- public Builder setChannelLogo(String channelLogo) {
- mChannelLogo = channelLogo;
- return this;
- }
-
- /**
* Sets the video format of the Channel.
*
* @param videoFormat The value of {@link Channels#COLUMN_VIDEO_FORMAT} for the channel.