Merge "API Review: Drawable" into mnc-dev
diff --git a/api/current.txt b/api/current.txt
index aa29ae8..6175651 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12255,7 +12255,6 @@
method public android.graphics.drawable.Drawable getCurrent();
method public android.graphics.Rect getDirtyBounds();
method public boolean getDither();
- method public boolean getFilterBitmap();
method public void getHotspotBounds(android.graphics.Rect);
method public int getIntrinsicHeight();
method public int getIntrinsicWidth();
@@ -12272,12 +12271,13 @@
method public void inflate(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 invalidateSelf();
method public boolean isAutoMirrored();
+ method public boolean isFilterBitmap();
method public boolean isStateful();
method public final boolean isVisible();
method public void jumpToCurrentState();
method public android.graphics.drawable.Drawable mutate();
method protected void onBoundsChange(android.graphics.Rect);
- method public boolean onLayoutDirectionChange(int);
+ method public boolean onLayoutDirectionChanged(int);
method protected boolean onLevelChange(int);
method protected boolean onStateChange(int[]);
method public static int resolveOpacity(int, int);
diff --git a/api/system-current.txt b/api/system-current.txt
index 0279b4a..1f2ad073 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -12562,7 +12562,6 @@
method public android.graphics.drawable.Drawable getCurrent();
method public android.graphics.Rect getDirtyBounds();
method public boolean getDither();
- method public boolean getFilterBitmap();
method public void getHotspotBounds(android.graphics.Rect);
method public int getIntrinsicHeight();
method public int getIntrinsicWidth();
@@ -12579,12 +12578,13 @@
method public void inflate(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 invalidateSelf();
method public boolean isAutoMirrored();
+ method public boolean isFilterBitmap();
method public boolean isStateful();
method public final boolean isVisible();
method public void jumpToCurrentState();
method public android.graphics.drawable.Drawable mutate();
method protected void onBoundsChange(android.graphics.Rect);
- method public boolean onLayoutDirectionChange(int);
+ method public boolean onLayoutDirectionChanged(int);
method protected boolean onLevelChange(int);
method protected boolean onStateChange(int[]);
method public static int resolveOpacity(int, int);
diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
index 28c26ff..b8f64a4 100644
--- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
@@ -31,6 +31,7 @@
import android.util.ArrayMap;
import android.util.AttributeSet;
import android.util.Log;
+import android.view.View;
import com.android.internal.R;
@@ -200,7 +201,7 @@
}
@Override
- public boolean onLayoutDirectionChange(int layoutDirection) {
+ public boolean onLayoutDirectionChanged(@View.ResolvedLayoutDir int layoutDirection) {
return mAnimatedVectorState.mVectorDrawable.setLayoutDirection(layoutDirection);
}
diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java
index 22ff3e74..e8e4664 100644
--- a/graphics/java/android/graphics/drawable/Drawable.java
+++ b/graphics/java/android/graphics/drawable/Drawable.java
@@ -276,7 +276,7 @@
public void setDither(boolean dither) {}
/**
- * @return whether this drawable dither its colors
+ * @return whether this drawable dithers its colors
* @see #setDither(boolean)
*/
public boolean getDither() {
@@ -295,7 +295,7 @@
* @return whether this drawable filters its bitmap
* @see #setFilterBitmap(boolean)
*/
- public boolean getFilterBitmap() {
+ public boolean isFilterBitmap() {
return false;
}
@@ -444,7 +444,7 @@
public final boolean setLayoutDirection(@View.ResolvedLayoutDir int layoutDirection) {
if (mLayoutDirection != layoutDirection) {
mLayoutDirection = layoutDirection;
- return onLayoutDirectionChange(layoutDirection);
+ return onLayoutDirectionChanged(layoutDirection);
}
return false;
}
@@ -457,7 +457,7 @@
* the drawable to change and it needs to be re-drawn
* @see #setLayoutDirection(int)
*/
- public boolean onLayoutDirectionChange(@View.ResolvedLayoutDir int layoutDirection) {
+ public boolean onLayoutDirectionChanged(@View.ResolvedLayoutDir int layoutDirection) {
return false;
}
diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java
index 4a06805..8b801c3 100644
--- a/graphics/java/android/graphics/drawable/DrawableContainer.java
+++ b/graphics/java/android/graphics/drawable/DrawableContainer.java
@@ -31,6 +31,7 @@
import android.os.SystemClock;
import android.util.LayoutDirection;
import android.util.SparseArray;
+import android.view.View;
import java.util.Collection;
@@ -337,7 +338,7 @@
}
@Override
- public boolean onLayoutDirectionChange(int layoutDirection) {
+ public boolean onLayoutDirectionChanged(@View.ResolvedLayoutDir int layoutDirection) {
// Let the container handle setting its own layout direction. Otherwise,
// we're accessing potentially unused states.
return mDrawableContainerState.setLayoutDirection(layoutDirection, getCurrentIndex());
diff --git a/graphics/java/android/graphics/drawable/DrawableWrapper.java b/graphics/java/android/graphics/drawable/DrawableWrapper.java
index bd8eae0..58d43f9 100644
--- a/graphics/java/android/graphics/drawable/DrawableWrapper.java
+++ b/graphics/java/android/graphics/drawable/DrawableWrapper.java
@@ -258,7 +258,7 @@
}
@Override
- public boolean onLayoutDirectionChange(@View.ResolvedLayoutDir int layoutDirection) {
+ public boolean onLayoutDirectionChanged(@View.ResolvedLayoutDir int layoutDirection) {
return mDrawable != null && mDrawable.setLayoutDirection(layoutDirection);
}
diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java
index e5b4612..5c00a23 100644
--- a/graphics/java/android/graphics/drawable/LayerDrawable.java
+++ b/graphics/java/android/graphics/drawable/LayerDrawable.java
@@ -1662,7 +1662,7 @@
}
@Override
- public boolean onLayoutDirectionChange(int layoutDirection) {
+ public boolean onLayoutDirectionChanged(@View.ResolvedLayoutDir int layoutDirection) {
boolean changed = false;
final ChildDrawable[] array = mLayerState.mChildren;