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

Merge change 26636 into eclair

Browse Source 
* changes:
  Fix #2101821: Cut labels of menu items in "SnapTell" market app.
This commit is contained in:
Android (Google) Code Review
2009-09-23 14:45:17 -04:00
parent 830207cab4 b8a9f12802
commit 7475be4bc2
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
graphics/java/android/graphics/drawable/NinePatchDrawable.java
View File

@@ -156,10 +156,24 @@ public class NinePatchDrawable extends Drawable {
private void computeBitmapSize() { private void computeBitmapSize() {
final int sdensity = mNinePatch.getDensity(); final int sdensity = mNinePatch.getDensity();
final int tdensity = mTargetDensity; final int tdensity = mTargetDensity;
mBitmapWidth = Bitmap.scaleFromDensity(mNinePatch.getWidth(), if (sdensity == tdensity) {
sdensity, tdensity); mBitmapWidth = mNinePatch.getWidth();
mBitmapHeight = Bitmap.scaleFromDensity(mNinePatch.getHeight(), mBitmapHeight = mNinePatch.getHeight();
sdensity, tdensity); } else {
mBitmapWidth = Bitmap.scaleFromDensity(mNinePatch.getWidth(),
sdensity, tdensity);
mBitmapHeight = Bitmap.scaleFromDensity(mNinePatch.getHeight(),
sdensity, tdensity);
Rect dest = mPadding;
Rect src = mNinePatchState.mPadding;
if (dest == src) {
mPadding = dest = new Rect(src);
}
dest.left = Bitmap.scaleFromDensity(src.left, sdensity, tdensity);
dest.top = Bitmap.scaleFromDensity(src.top, sdensity, tdensity);
dest.right = Bitmap.scaleFromDensity(src.right, sdensity, tdensity);
dest.bottom = Bitmap.scaleFromDensity(src.bottom, sdensity, tdensity);
}
} }
// overrides // overrides
@@ -320,7 +334,6 @@ public class NinePatchDrawable extends Drawable {
if (!mMutated && super.mutate() == this) { if (!mMutated && super.mutate() == this) {
mNinePatchState = new NinePatchState(mNinePatchState); mNinePatchState = new NinePatchState(mNinePatchState);
mNinePatch = mNinePatchState.mNinePatch; mNinePatch = mNinePatchState.mNinePatch;
mPadding = mNinePatchState.mPadding;
mMutated = true; mMutated = true;
} }
return this; return this;
@@ -345,7 +358,8 @@ public class NinePatchDrawable extends Drawable {
NinePatchState(NinePatchState state) { NinePatchState(NinePatchState state) {
mNinePatch = new NinePatch(state.mNinePatch); mNinePatch = new NinePatch(state.mNinePatch);
mPadding = new Rect(state.mPadding); // Note we don't copy the padding because it is immutable.
mPadding = state.mPadding;
mDither = state.mDither; mDither = state.mDither;
mChangingConfigurations = state.mChangingConfigurations; mChangingConfigurations = state.mChangingConfigurations;
mTargetDensity = state.mTargetDensity; mTargetDensity = state.mTargetDensity;