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

am 1c252a6f: Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev automerge: 26478ba

Browse Source 
automerge: 84ed482

* commit '84ed482ff9a9e8f6ea6e14c978d4311f23396bc6':
  Fix default attributes in ScaleDrawable
This commit is contained in:
Alan Viverette
2014-11-12 23:59:56 +00:00
committed by android-build-merger
parent 35f6c4f702 84ed482ff9
commit edd1e72631
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);
state.mScaleHeight = getPercent(
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(
R.styleable.ScaleDrawable_useIntrinsicSizeAsMinimum, false);
R.styleable.ScaleDrawable_useIntrinsicSizeAsMinimum, state.mUseIntrinsicSizeAsMin);
final Drawable dr = a.getDrawable(R.styleable.ScaleDrawable_drawable);
if (dr != null) {
@@ -347,13 +347,16 @@ public class ScaleDrawable extends Drawable implements Drawable.Callback {
}
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 mChangingConfigurations;
Drawable mDrawable;
float mScaleWidth = 1.0f;
float mScaleHeight = 1.0f;
float mScaleWidth = DO_NOT_SCALE;
float mScaleHeight = DO_NOT_SCALE;
int mGravity = Gravity.LEFT;
boolean mUseIntrinsicSizeAsMin = false;