From e24cc7208a6d3760a87dfd4b80a7a6683fe146eb Mon Sep 17 00:00:00 2001 From: Bobby Georgescu Date: Mon, 13 Aug 2012 13:30:02 -0700 Subject: Show album counts in Gallery & other small reskin fixes Bug: 6975144 Change-Id: I2f12c6482cc009aecbca3e26482ebd8944f01bb8 --- src/com/android/gallery3d/app/Config.java | 2 ++ src/com/android/gallery3d/ui/AlbumLabelMaker.java | 17 +++++++++-------- src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/com/android/gallery3d/app/Config.java b/src/com/android/gallery3d/app/Config.java index a95427b35..bd4aed1d5 100644 --- a/src/com/android/gallery3d/app/Config.java +++ b/src/com/android/gallery3d/app/Config.java @@ -58,6 +58,8 @@ final class Config { R.dimen.albumset_count_font_size); labelSpec.leftMargin = r.getDimensionPixelSize( R.dimen.albumset_left_margin); + labelSpec.titleRightMargin = r.getDimensionPixelSize( + R.dimen.albumset_title_right_margin); labelSpec.iconSize = r.getDimensionPixelSize( R.dimen.albumset_icon_size); } diff --git a/src/com/android/gallery3d/ui/AlbumLabelMaker.java b/src/com/android/gallery3d/ui/AlbumLabelMaker.java index a689e6990..4a1d545b7 100644 --- a/src/com/android/gallery3d/ui/AlbumLabelMaker.java +++ b/src/com/android/gallery3d/ui/AlbumLabelMaker.java @@ -181,17 +181,18 @@ public class AlbumLabelMaker { // draw title if (jc.isCancelled()) return null; int x = s.leftMargin + s.iconSize; - int y = s.titleOffset; - drawText(canvas, x, y, title, labelWidth - s.leftMargin, mTitlePaint); + // TODO: is the offset relevant in new reskin? + // int y = s.titleOffset; + int y = (s.labelBackgroundHeight - s.titleFontSize) / 2; + drawText(canvas, x, y, title, labelWidth - s.leftMargin - x - + s.titleRightMargin, mTitlePaint); - // TODO: draw the count once visual designers finalize where - /* + // draw count if (jc.isCancelled()) return null; - if (icon != null) x = s.iconSize; - y += s.titleFontSize + s.countOffset; + x = labelWidth - s.titleRightMargin; + y = (s.labelBackgroundHeight - s.countFontSize) / 2; drawText(canvas, x, y, count, - labelWidth - s.leftMargin - s.iconSize, mCountPaint); - */ + labelWidth - x , mCountPaint); // draw the icon if (icon != null) { diff --git a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java index f58c033b0..cee36d969 100644 --- a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java +++ b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java @@ -51,6 +51,7 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer { public int countFontSize; public int leftMargin; public int iconSize; + public int titleRightMargin; } public AlbumSetSlotRenderer(GalleryActivity activity, SelectionManager selectionManager, -- cgit v1.2.3