commit 3ea54fdb490b973e2754cb438c7341e35df3b4cc
author Winson Chung <winsonc@google.com> Thu Jul 30 23:57:08 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 30 23:57:08 2015 +0000
tree b00848fda62b43f04e1ce2c09561b745d65a25a5
parent 1014e7de0e6c62587b507342f8b477ea84fa635d
parent deaf4d169b6e08ae2c41ae67ea97147164089b16

Merge "Fixing issue with accessibility falsely reporting app count when there are no search results." into ub-launcher3-burnaby

src/com/android/launcher3/WidgetPreviewLoader.java

diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index 629387e..2a8053d 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -386,7 +386,7 @@
             preScaledWidthOut[0] = previewWidth;
         }
         if (previewWidth > maxPreviewWidth) {
-            scale = maxPreviewWidth / (float) previewWidth;
+            scale = (maxPreviewWidth - 2 * mProfileBadgeMargin) / (float) (previewWidth);
         }
         if (scale != 1f) {
             previewWidth = (int) (scale * previewWidth);
@@ -405,7 +405,7 @@
         }
 
         // Draw the scaled preview into the final bitmap
-        int x = (preview.getWidth() - previewWidth - mProfileBadgeMargin) / 2;
+        int x = (preview.getWidth() - previewWidth) / 2;
         if (widgetPreviewExists) {
             drawable.setBounds(x, 0, x + previewWidth, previewHeight);
             drawable.draw(c);