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

Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev

Browse Source 
automerge: 26478ba

* commit '26478bad42dd3d446131ae65ee0bf6880a950889':
  Fix default attributes in ScaleDrawable
This commit is contained in:
Alan Viverette
2014-11-12 21:20:41 +00:00
committed by android-build-merger
parent ac598888e3 26478bad42
commit 1c252a6f8b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
graphics/java/android/graphics/drawable/ScaleDrawable.java
View File

@@ -173,9 +173,9 @@ public class ScaleDrawable extends Drawable implements Drawable.Callback {
a, R.styleable.ScaleDrawable_scaleWidth, state.mScaleWidth); a, R.styleable.ScaleDrawable_scaleWidth, state.mScaleWidth);
state.mScaleHeight = getPercent( state.mScaleHeight = getPercent(
a, R.styleable.ScaleDrawable_scaleHeight, state.mScaleHeight); a, R.styleable.ScaleDrawable_scaleHeight, state.mScaleHeight);
state.mGravity = a.getInt(R.styleable.ScaleDrawable_scaleGravity, Gravity.LEFT); state.mGravity = a.getInt(R.styleable.ScaleDrawable_scaleGravity, state.mGravity);
state.mUseIntrinsicSizeAsMin = a.getBoolean( state.mUseIntrinsicSizeAsMin = a.getBoolean(
R.styleable.ScaleDrawable_useIntrinsicSizeAsMinimum, false); R.styleable.ScaleDrawable_useIntrinsicSizeAsMinimum, state.mUseIntrinsicSizeAsMin);
final Drawable dr = a.getDrawable(R.styleable.ScaleDrawable_drawable); final Drawable dr = a.getDrawable(R.styleable.ScaleDrawable_drawable);
if (dr != null) { if (dr != null) {
@@ -347,13 +347,16 @@ public class ScaleDrawable extends Drawable implements Drawable.Callback {
} }
final static class ScaleState extends ConstantState { final static class ScaleState extends ConstantState {
/** Constant used to disable scaling for a particular dimension. */
private static final float DO_NOT_SCALE = -1.0f;
int[] mThemeAttrs; int[] mThemeAttrs;
int mChangingConfigurations; int mChangingConfigurations;
Drawable mDrawable; Drawable mDrawable;
float mScaleWidth = 1.0f; float mScaleWidth = DO_NOT_SCALE;
float mScaleHeight = 1.0f; float mScaleHeight = DO_NOT_SCALE;
int mGravity = Gravity.LEFT; int mGravity = Gravity.LEFT;
boolean mUseIntrinsicSizeAsMin = false; boolean mUseIntrinsicSizeAsMin = false;