summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2010-11-09 12:30:11 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-09 12:30:11 -0800
commit448b0b5e8665ec540ccefbb962f7ccb22e3bbb62 (patch)
tree2d4db0deed04239b127757297229c32e5a7dc338 /src
parentaff3e6e56de1f65923d67c2caf1f6027af50006e (diff)
parentc84001ec67236c070875324fb77f04ce63b46885 (diff)
downloadandroid_packages_apps_Trebuchet-448b0b5e8665ec540ccefbb962f7ccb22e3bbb62.tar.gz
android_packages_apps_Trebuchet-448b0b5e8665ec540ccefbb962f7ccb22e3bbb62.tar.bz2
android_packages_apps_Trebuchet-448b0b5e8665ec540ccefbb962f7ccb22e3bbb62.zip
Merge "Fixing issue where holgoraphic icon backgrounds were not being drawn."
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/PagedViewIcon.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher2/PagedViewIcon.java b/src/com/android/launcher2/PagedViewIcon.java
index 89cf331dd..50ba8d459 100644
--- a/src/com/android/launcher2/PagedViewIcon.java
+++ b/src/com/android/launcher2/PagedViewIcon.java
@@ -16,9 +16,6 @@
package com.android.launcher2;
-import com.android.launcher.R;
-import com.android.launcher2.PagedView.PagedViewIconCache;
-
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
@@ -26,7 +23,6 @@ import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Paint;
-import android.graphics.Rect;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Message;
@@ -34,6 +30,9 @@ import android.util.AttributeSet;
import android.widget.Checkable;
import android.widget.TextView;
+import com.android.launcher.R;
+import com.android.launcher2.PagedView.PagedViewIconCache;
+
/**
@@ -195,11 +194,12 @@ public class PagedViewIcon extends TextView implements Checkable {
}
if (overlay != null) {
+ final int offset = getScrollX();
final int compoundPaddingLeft = getCompoundPaddingLeft();
final int compoundPaddingRight = getCompoundPaddingRight();
int hspace = getWidth() - compoundPaddingRight - compoundPaddingLeft;
canvas.drawBitmap(overlay,
- compoundPaddingLeft + (hspace - overlay.getWidth()) / 2,
+ offset + compoundPaddingLeft + (hspace - overlay.getWidth()) / 2,
mPaddingTop,
mPaint);
}