diff options
| author | Winson Chung <winsonc@google.com> | 2013-12-02 15:00:39 -0800 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2013-12-02 15:01:39 -0800 |
| commit | 2cb2471e7fbade9a785c523df5941f2855e99041 (patch) | |
| tree | 75a9d57d2289dfc0e65d7a07e2f444eb0167af0b /src | |
| parent | 1a5adf4f4cb30114fc0e508651b2833dd15674d0 (diff) | |
| download | android_packages_apps_Trebuchet-2cb2471e7fbade9a785c523df5941f2855e99041.tar.gz android_packages_apps_Trebuchet-2cb2471e7fbade9a785c523df5941f2855e99041.tar.bz2 android_packages_apps_Trebuchet-2cb2471e7fbade9a785c523df5941f2855e99041.zip | |
Ensure we pass search bar bounds to GoogleSearch. (Bug 11968598)
Change-Id: I10027c2c10bbc5b2f2e63276dc91ceca0bf59a08
Diffstat (limited to 'src')
| -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); } |