Merge "Fix texture generation issue on Home."

This commit is contained in:
Romain Guy
2010-02-04 16:02:22 -08:00
committed by Android (Google) Code Review
3 changed files with 3 additions and 6 deletions
-2
View File
@@ -17,7 +17,5 @@
<resources>
<dimen name="workspace_cell_width">106dip</dimen>
<dimen name="workspace_cell_height">74dip</dimen>
<dimen name="gesture_thumbnail_inset">8dip</dimen>
<dimen name="gesture_thumbnail_size">64dip</dimen>
<dimen name="button_bar_height">62dip</dimen>
</resources>
+1 -2
View File
@@ -15,7 +15,6 @@
-->
<resources>
<dimen name="gesture_thumbnail_inset">8dip</dimen>
<dimen name="gesture_thumbnail_size">64dip</dimen>
<dimen name="title_texture_width">120px</dimen>
<dimen name="button_bar_height">56dip</dimen>
</resources>
+2 -2
View File
@@ -372,7 +372,7 @@ final class Utilities {
final float paddingLeft = 5.0f * scale;
final float paddingRight = 5.0f * scale;
final float cellWidth = resources.getDimension(R.dimen.workspace_cell_width);
final float cellWidth = resources.getDimension(R.dimen.title_texture_width);
final float bubbleWidth = cellWidth - paddingLeft - paddingRight;
mBubblePadding = 3.0f * scale;
@@ -399,7 +399,7 @@ final class Utilities {
mFirstLineY = (int)(leading + ascent + 0.5f);
mLineHeight = (int)(leading + ascent + descent + 0.5f);
mBitmapWidth = roundToPow2((int)(mBubbleRect.width() + 0.5f));
mBitmapWidth = (int)(mBubbleRect.width() + 0.5f);
mBitmapHeight = roundToPow2((int)((MAX_LINES * mLineHeight) + leading + 0.5f));
mBubbleRect.offsetTo((mBitmapWidth-mBubbleRect.width())/2, 0);