diff options
| author | Winson Chung <winsonc@google.com> | 2013-12-03 07:07:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-03 07:07:30 -0800 |
| commit | 0c1b33dbd44d957090abe5647af7fbe1b4f5ff1a (patch) | |
| tree | 2ff2b704e0124047e7ba4a7c9bfdab2fd095ce5a | |
| parent | ab84b8b4efa57e658c2c43f2876968b61cbe4005 (diff) | |
| parent | 2cb2471e7fbade9a785c523df5941f2855e99041 (diff) | |
| download | android_packages_apps_Trebuchet-0c1b33dbd44d957090abe5647af7fbe1b4f5ff1a.tar.gz android_packages_apps_Trebuchet-0c1b33dbd44d957090abe5647af7fbe1b4f5ff1a.tar.bz2 android_packages_apps_Trebuchet-0c1b33dbd44d957090abe5647af7fbe1b4f5ff1a.zip | |
am 2cb2471e: Ensure we pass search bar bounds to GoogleSearch. (Bug 11968598)
* commit '2cb2471e7fbade9a785c523df5941f2855e99041':
Ensure we pass search bar bounds to GoogleSearch. (Bug 11968598)
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 930188587..9e1f1a7b1 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -449,10 +449,12 @@ public class DeviceProfile { // that into account here too. int gap = (int) ((width - 2 * edgeMarginPx - (numColumns * cellWidthPx)) / (2 * (numColumns + 1))); - bounds.set(edgeMarginPx + gap, 0, availableWidthPx - (edgeMarginPx + gap), + bounds.set(edgeMarginPx + gap, getSearchBarTopOffset(), + availableWidthPx - (edgeMarginPx + gap), searchBarSpaceHeightPx); } else { - bounds.set(desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.left, 0, + bounds.set(desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.left, + getSearchBarTopOffset(), availableWidthPx - (desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.right), searchBarSpaceHeightPx); } |