diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-10-24 16:39:41 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2012-10-24 16:40:43 -0700 |
| commit | 7592704e662e49e4bbf3ba86a43d790774829bb0 (patch) | |
| tree | d6350615b39a7a81d2928cd472e000d241679491 /src | |
| parent | ecbdca3de8ada82d3d6f723d9ba509a3b1b1b290 (diff) | |
| download | android_packages_apps_Gallery2-7592704e662e49e4bbf3ba86a43d790774829bb0.tar.gz android_packages_apps_Gallery2-7592704e662e49e4bbf3ba86a43d790774829bb0.tar.bz2 android_packages_apps_Gallery2-7592704e662e49e4bbf3ba86a43d790774829bb0.zip | |
Fixes UI stuff
bug:7393871
bug:7387596
Change-Id: I833c6f713ab71c4dce896f66e191a2a1a42b3e2f
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/ui/FramedTextButton.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 70e5300fc..a873bbe6b 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -82,6 +82,7 @@ import com.android.gallery3d.filtershow.imageshow.ImageZoom; import com.android.gallery3d.filtershow.presets.ImagePreset; import com.android.gallery3d.filtershow.provider.SharedImageProvider; import com.android.gallery3d.filtershow.tools.SaveCopyTask; +import com.android.gallery3d.filtershow.ui.FramedTextButton; import com.android.gallery3d.filtershow.ui.ImageButtonTitle; import com.android.gallery3d.filtershow.ui.ImageCurves; import com.android.gallery3d.filtershow.ui.Spline; @@ -152,6 +153,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, ImageShow.setDefaultBackgroundColor(getResources().getColor(R.color.background_screen)); ImageSmallFilter.setDefaultBackgroundColor(getResources().getColor(R.color.background_main_toolbar)); // TODO: get those values from XML. + FramedTextButton.setTextSize((int) getPixelsFromDip(14)); ImageShow.setTextSize((int) getPixelsFromDip(12)); ImageShow.setTextPadding((int) getPixelsFromDip(10)); ImageShow.setOriginalTextMargin((int) getPixelsFromDip(4)); diff --git a/src/com/android/gallery3d/filtershow/ui/FramedTextButton.java b/src/com/android/gallery3d/filtershow/ui/FramedTextButton.java index 4abd7c075..17453d070 100644 --- a/src/com/android/gallery3d/filtershow/ui/FramedTextButton.java +++ b/src/com/android/gallery3d/filtershow/ui/FramedTextButton.java @@ -90,6 +90,8 @@ public class FramedTextButton extends ImageButton { canvas.drawRect(mTextPadding, mTextPadding, getWidth() - mTextPadding, getHeight() - mTextPadding, gPaint); if (mText != null) { + gPaint.reset(); + gPaint.setARGB(255, 255, 255, 255); gPaint.setTextSize(mTextSize); float textWidth = gPaint.measureText(mText); Rect bounds = new Rect(); |