Merge "Fixing issue where holgoraphic icon backgrounds were not being drawn."

This commit is contained in:
Winson Chung
2010-11-09 12:30:11 -08:00
committed by Android (Google) Code Review
3 changed files with 5 additions and 9 deletions

View File

@@ -27,7 +27,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:singleLine="false"
android:maxLines="1"
style="@style/WorkspaceIcon.Portrait" />

View File

@@ -26,7 +26,5 @@
android:id="@+id/customize_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:singleLine="false"
android:maxLines="1"
style="@style/WorkspaceIcon.Landscape" />

View File

@@ -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);
}