diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-01-13 16:14:11 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-01-13 16:14:11 -0800 |
| commit | c0d8068c83517611bbe576ca2aee7e14a22cc5b4 (patch) | |
| tree | b387564cf8bd3ab8f046b73e650669495bfa96f2 /src/com/android | |
| parent | 9209a5433e886c423ec841ec7a65c062eb38e425 (diff) | |
| parent | 8da9643300a564c3e54c525543d38ac8e8b7f2cc (diff) | |
| download | android_packages_apps_Gallery2-c0d8068c83517611bbe576ca2aee7e14a22cc5b4.tar.gz android_packages_apps_Gallery2-c0d8068c83517611bbe576ca2aee7e14a22cc5b4.tar.bz2 android_packages_apps_Gallery2-c0d8068c83517611bbe576ca2aee7e14a22cc5b4.zip | |
Merge "Gallery2: fix display abnormal on album page when in RTL mode."
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/gallery3d/ui/AlbumLabelMaker.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/com/android/gallery3d/ui/AlbumLabelMaker.java b/src/com/android/gallery3d/ui/AlbumLabelMaker.java index 20e4a2dea..0216ffd7f 100644 --- a/src/com/android/gallery3d/ui/AlbumLabelMaker.java +++ b/src/com/android/gallery3d/ui/AlbumLabelMaker.java @@ -216,18 +216,17 @@ public class AlbumLabelMaker { if (jc.isCancelled()) return null; int strLength = (int) mTitlePaint.measureText(title); if (!isAlbumListViewShown) { - int x = labelWidth - s.leftMargin - strLength; - // 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, mTitlePaint); + int x = labelWidth - s.leftMargin - strLength; + // 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, mTitlePaint); - // draw count - if (jc.isCancelled()) return null; - x = s.leftMargin + 10 - s.titleRightMargin;// plus 10 to get a much bigger margin - y = (s.labelBackgroundHeight - s.countFontSize) / 2; - drawText(canvas, x, y, count, - labelWidth - x, mCountPaint); + // draw count + if (jc.isCancelled()) return null; + x = s.leftMargin + 10;// plus 10 to get a much bigger margin + y = (s.labelBackgroundHeight - s.countFontSize) / 2; + drawText(canvas, x, y, count, labelWidth - x, mCountPaint); } else { int x = labelWidth - (s1.leftMargin + s1.iconSize) |