Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support fraction type for inset* for InsetDrawable. b/36024318" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-21 15:14:18 +00:00
committed by Android (Google) Code Review
parent d3892caf95 d0dfe3008d
commit ab7a2879eb
6 changed files with 160 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -14182,7 +14182,9 @@ package android.graphics.drawable {
public class InsetDrawable extends android.graphics.drawable.DrawableWrapper {
ctor public InsetDrawable(android.graphics.drawable.Drawable, int);
ctor public InsetDrawable(android.graphics.drawable.Drawable, float);
ctor public InsetDrawable(android.graphics.drawable.Drawable, int, int, int, int);
ctor public InsetDrawable(android.graphics.drawable.Drawable, float, float, float, float);
}
public class LayerDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {

2
api/system-current.txt
View File

@@ -14956,7 +14956,9 @@ package android.graphics.drawable {
public class InsetDrawable extends android.graphics.drawable.DrawableWrapper {
ctor public InsetDrawable(android.graphics.drawable.Drawable, int);
ctor public InsetDrawable(android.graphics.drawable.Drawable, float);
ctor public InsetDrawable(android.graphics.drawable.Drawable, int, int, int, int);
ctor public InsetDrawable(android.graphics.drawable.Drawable, float, float, float, float);
}
public class LayerDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {

2
api/test-current.txt
View File

@@ -14226,7 +14226,9 @@ package android.graphics.drawable {
public class InsetDrawable extends android.graphics.drawable.DrawableWrapper {
ctor public InsetDrawable(android.graphics.drawable.Drawable, int);
ctor public InsetDrawable(android.graphics.drawable.Drawable, float);
ctor public InsetDrawable(android.graphics.drawable.Drawable, int, int, int, int);
ctor public InsetDrawable(android.graphics.drawable.Drawable, float, float, float, float);
}
public class LayerDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {

9
core/res/res/drawable/sym_def_app_icon.xml
View File

@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@android:color/white" />
<foreground android:drawable="@mipmap/sym_def_app_icon_maskable" />
<foreground>
<inset android:insetLeft="27.7%"
android:insetTop="27.7%"
android:insetRight="27.7%"
android:insetBottom="27.7%">
<bitmap android:src="@mipmap/sym_def_app_icon"/>
</inset>
</foreground>
</adaptive-icon>

10
core/res/res/values/attrs.xml
View File

@@ -5767,11 +5767,11 @@
<declare-styleable name="InsetDrawable">
<attr name="visible" />
<attr name="drawable" />
<attr name="inset" format="dimension"/>
<attr name="insetLeft" format="dimension" />
<attr name="insetRight" format="dimension" />
<attr name="insetTop" format="dimension" />
<attr name="insetBottom" format="dimension" />
<attr name="inset" format="fraction|dimension"/>
<attr name="insetLeft" format="fraction|dimension" />
<attr name="insetRight" format="fraction|dimension" />
<attr name="insetTop" format="fraction|dimension" />
<attr name="insetBottom" format="fraction|dimension" />
</declare-styleable>
<!-- Drawable used to draw bitmaps. -->

189
graphics/java/android/graphics/drawable/InsetDrawable.java
View File

@@ -33,11 +33,12 @@ import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import java.io.IOException;
/**
* A Drawable that insets another Drawable by a specified distance.
* A Drawable that insets another Drawable by a specified distance or fraction of the content bounds.
* This is used when a View needs a background that is smaller than
* the View's actual bounds.
*
@@ -54,6 +55,7 @@ import java.io.IOException;
*/
public class InsetDrawable extends DrawableWrapper {
private final Rect mTmpRect = new Rect();
private final Rect mTmpInsetRect = new Rect();
private InsetState mState;
@@ -75,7 +77,17 @@ public class InsetDrawable extends DrawableWrapper {
}
/**
* Creates a new inset drawable with the specified insets.
* Creates a new inset drawable with the specified inset.
*
* @param drawable The drawable to inset.
* @param inset Inset in fraction (range: [0, 1)) of the inset content bounds.
*/
public InsetDrawable(@Nullable Drawable drawable, float inset) {
this(drawable, inset, inset, inset, inset);
}
/**
* Creates a new inset drawable with the specified insets in pixels.
*
* @param drawable The drawable to inset.
* @param insetLeft Left inset in pixels.
@@ -87,10 +99,31 @@ public class InsetDrawable extends DrawableWrapper {
int insetRight, int insetBottom) {
this(new InsetState(null, null), null);
mState.mInsetLeft = insetLeft;
mState.mInsetTop = insetTop;
mState.mInsetRight = insetRight;
mState.mInsetBottom = insetBottom;
mState.mInsetLeft = new InsetValue(0f, insetLeft);
mState.mInsetTop = new InsetValue(0f, insetTop);
mState.mInsetRight = new InsetValue(0f, insetRight);
mState.mInsetBottom = new InsetValue(0f, insetBottom);
setDrawable(drawable);
}
/**
* Creates a new inset drawable with the specified insets in fraction of the view bounds.
*
* @param drawable The drawable to inset.
* @param insetLeftFraction Left inset in fraction (range: [0, 1)) of the inset content bounds.
* @param insetTopFraction Top inset in fraction (range: [0, 1)) of the inset content bounds.
* @param insetRightFraction Right inset in fraction (range: [0, 1)) of the inset content bounds.
* @param insetBottomFraction Bottom inset in fraction (range: [0, 1)) of the inset content bounds.
*/
public InsetDrawable(@Nullable Drawable drawable, float insetLeftFraction,
float insetTopFraction, float insetRightFraction, float insetBottomFraction) {
this(new InsetState(null, null), null);
mState.mInsetLeft = new InsetValue(insetLeftFraction, 0);
mState.mInsetTop = new InsetValue(insetTopFraction, 0);
mState.mInsetRight = new InsetValue(insetRightFraction, 0);
mState.mInsetBottom = new InsetValue(insetBottomFraction, 0);
setDrawable(drawable);
}
@@ -155,52 +188,75 @@ public class InsetDrawable extends DrawableWrapper {
// Inset attribute may be overridden by more specific attributes.
if (a.hasValue(R.styleable.InsetDrawable_inset)) {
final int inset = a.getDimensionPixelOffset(R.styleable.InsetDrawable_inset, 0);
final InsetValue inset = getInset(a, R.styleable.InsetDrawable_inset, 0);
state.mInsetLeft = inset;
state.mInsetTop = inset;
state.mInsetRight = inset;
state.mInsetBottom = inset;
}
state.mInsetLeft = getInset(a, R.styleable.InsetDrawable_insetLeft, 0);
state.mInsetTop = getInset(a, R.styleable.InsetDrawable_insetTop, 0);
state.mInsetRight = getInset(a, R.styleable.InsetDrawable_insetRight, 0);
state.mInsetBottom = getInset(a, R.styleable.InsetDrawable_insetBottom, 0);
}
state.mInsetLeft = a.getDimensionPixelOffset(
R.styleable.InsetDrawable_insetLeft, state.mInsetLeft);
state.mInsetRight = a.getDimensionPixelOffset(
R.styleable.InsetDrawable_insetRight, state.mInsetRight);
state.mInsetTop = a.getDimensionPixelOffset(
R.styleable.InsetDrawable_insetTop, state.mInsetTop);
state.mInsetBottom = a.getDimensionPixelOffset(
R.styleable.InsetDrawable_insetBottom, state.mInsetBottom);
private InsetValue getInset(@NonNull TypedArray a, int index, int defaultValue) {
if (a.hasValue(index)) {
TypedValue tv = a.peekValue(index);
if (tv.type == TypedValue.TYPE_FRACTION) {
float f = tv.getFraction(1.0f, 1.0f);
if (f >= 1f) {
throw new IllegalStateException("Fraction cannot be larger than 1");
}
return new InsetValue(f, 0);
} else {
return new InsetValue(0f, a.getDimensionPixelOffset(index, defaultValue));
}
}
return new InsetValue();
}
private void getInsets(Rect out) {
final Rect b = getBounds();
out.left = mState.mInsetLeft.getDimension(b.width());
out.right = mState.mInsetRight.getDimension(b.width());
out.top = mState.mInsetTop.getDimension(b.height());
out.bottom = mState.mInsetBottom.getDimension(b.height());
}
@Override
public boolean getPadding(Rect padding) {
final boolean pad = super.getPadding(padding);
getInsets(mTmpInsetRect);
padding.left += mTmpInsetRect.left;
padding.right += mTmpInsetRect.right;
padding.top += mTmpInsetRect.top;
padding.bottom += mTmpInsetRect.bottom;
padding.left += mState.mInsetLeft;
padding.right += mState.mInsetRight;
padding.top += mState.mInsetTop;
padding.bottom += mState.mInsetBottom;
return pad || (mState.mInsetLeft | mState.mInsetRight
| mState.mInsetTop | mState.mInsetBottom) != 0;
return pad || (mTmpInsetRect.left | mTmpInsetRect.right
| mTmpInsetRect.top | mTmpInsetRect.bottom) != 0;
}
/** @hide */
@Override
public Insets getOpticalInsets() {
final Insets contentInsets = super.getOpticalInsets();
return Insets.of(contentInsets.left + mState.mInsetLeft,
contentInsets.top + mState.mInsetTop,
contentInsets.right + mState.mInsetRight,
contentInsets.bottom + mState.mInsetBottom);
getInsets(mTmpInsetRect);
return Insets.of(
contentInsets.left + mTmpInsetRect.left,
contentInsets.top + mTmpInsetRect.top,
contentInsets.right + mTmpInsetRect.right,
contentInsets.bottom + mTmpInsetRect.bottom);
}
@Override
public int getOpacity() {
final InsetState state = mState;
final int opacity = getDrawable().getOpacity();
if (opacity == PixelFormat.OPAQUE && (state.mInsetLeft > 0 || state.mInsetTop > 0
|| state.mInsetRight > 0 || state.mInsetBottom > 0)) {
getInsets(mTmpInsetRect);
if (opacity == PixelFormat.OPAQUE &&
(mTmpInsetRect.left > 0 || mTmpInsetRect.top > 0 || mTmpInsetRect.right > 0
|| mTmpInsetRect.bottom > 0)) {
return PixelFormat.TRANSLUCENT;
}
return opacity;
@@ -211,10 +267,10 @@ public class InsetDrawable extends DrawableWrapper {
final Rect r = mTmpRect;
r.set(bounds);
r.left += mState.mInsetLeft;
r.top += mState.mInsetTop;
r.right -= mState.mInsetRight;
r.bottom -= mState.mInsetBottom;
r.left += mState.mInsetLeft.getDimension(bounds.width());
r.top += mState.mInsetTop.getDimension(bounds.height());
r.right -= mState.mInsetRight.getDimension(bounds.width());
r.bottom -= mState.mInsetBottom.getDimension(bounds.height());
// Apply inset bounds to the wrapped drawable.
super.onBoundsChange(r);
@@ -223,19 +279,23 @@ public class InsetDrawable extends DrawableWrapper {
@Override
public int getIntrinsicWidth() {
final int childWidth = getDrawable().getIntrinsicWidth();
if (childWidth < 0) {
final float fraction = mState.mInsetLeft.mFraction + mState.mInsetRight.mFraction;
if (childWidth < 0 || fraction >= 1) {
return -1;
}
return childWidth + mState.mInsetLeft + mState.mInsetRight;
return (int) (childWidth / (1 - fraction)) + mState.mInsetLeft.mDimension
+ mState.mInsetRight.mDimension;
}
@Override
public int getIntrinsicHeight() {
final int childHeight = getDrawable().getIntrinsicHeight();
if (childHeight < 0) {
final float fraction = mState.mInsetTop.mFraction + mState.mInsetBottom.mFraction;
if (childHeight < 0 || fraction >= 1) {
return -1;
}
return childHeight + mState.mInsetTop + mState.mInsetBottom;
return (int) (childHeight / (1 - fraction)) + mState.mInsetTop.mDimension
+ mState.mInsetBottom.mDimension;
}
@Override
@@ -252,23 +312,28 @@ public class InsetDrawable extends DrawableWrapper {
static final class InsetState extends DrawableWrapper.DrawableWrapperState {
private int[] mThemeAttrs;
int mInsetLeft = 0;
int mInsetTop = 0;
int mInsetRight = 0;
int mInsetBottom = 0;
InsetValue mInsetLeft;
InsetValue mInsetTop;
InsetValue mInsetRight;
InsetValue mInsetBottom;
InsetState(@Nullable InsetState orig, @Nullable Resources res) {
super(orig, res);
if (orig != null) {
mInsetLeft = orig.mInsetLeft;
mInsetTop = orig.mInsetTop;
mInsetRight = orig.mInsetRight;
mInsetBottom = orig.mInsetBottom;
mInsetLeft = orig.mInsetLeft.clone();
mInsetTop = orig.mInsetTop.clone();
mInsetRight = orig.mInsetRight.clone();
mInsetBottom = orig.mInsetBottom.clone();
if (orig.mDensity != mDensity) {
applyDensityScaling(orig.mDensity, mDensity);
}
} else {
mInsetLeft = new InsetValue();
mInsetTop = new InsetValue();
mInsetRight = new InsetValue();
mInsetBottom = new InsetValue();
}
}
@@ -287,10 +352,10 @@ public class InsetDrawable extends DrawableWrapper {
* @param targetDensity the new constant state density
*/
private void applyDensityScaling(int sourceDensity, int targetDensity) {
mInsetLeft = Bitmap.scaleFromDensity(mInsetLeft, sourceDensity, targetDensity);
mInsetTop = Bitmap.scaleFromDensity(mInsetTop, sourceDensity, targetDensity);
mInsetRight = Bitmap.scaleFromDensity(mInsetRight, sourceDensity, targetDensity);
mInsetBottom = Bitmap.scaleFromDensity(mInsetBottom, sourceDensity, targetDensity);
mInsetLeft.scaleFromDensity(sourceDensity, targetDensity);
mInsetTop.scaleFromDensity(sourceDensity, targetDensity);
mInsetRight.scaleFromDensity(sourceDensity, targetDensity);
mInsetBottom.scaleFromDensity(sourceDensity, targetDensity);
}
@Override
@@ -314,6 +379,34 @@ public class InsetDrawable extends DrawableWrapper {
}
}
static final class InsetValue implements Cloneable {
final float mFraction;
int mDimension;
public InsetValue() {
this(0f, 0);
}
public InsetValue(float fraction, int dimension) {
mFraction = fraction;
mDimension = dimension;
}
int getDimension(int boundSize) {
return (int) (boundSize * mFraction) + mDimension;
}
void scaleFromDensity(int sourceDensity, int targetDensity) {
if (mDimension != 0) {
mDimension = Bitmap.scaleFromDensity(mDimension, sourceDensity, targetDensity);
}
}
@Override
public InsetValue clone() {
return new InsetValue(mFraction, mDimension);
}
}
/**
* The one constructor to rule them all. This is called by all public
* constructors to set the state and initialize local properties.