diff options
| author | Winson Chung <winsonc@google.com> | 2013-12-02 15:00:39 -0800 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:20 -0700 |
| commit | e35719b5900378675f70c68effa92f64ba8385f2 (patch) | |
| tree | 13f0f62ba031cc3a9d9d343abc4b75a73a06ff10 /src | |
| parent | dd0f6a8089d9dd126c3844a1d3bc192aee40d279 (diff) | |
| download | android_packages_apps_Trebuchet-e35719b5900378675f70c68effa92f64ba8385f2.tar.gz android_packages_apps_Trebuchet-e35719b5900378675f70c68effa92f64ba8385f2.tar.bz2 android_packages_apps_Trebuchet-e35719b5900378675f70c68effa92f64ba8385f2.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 5c6d77f4a..e456a3bc6 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -466,10 +466,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), searchBarVisible ? searchBarSpaceHeightPx : edgeMarginPx); } else { - bounds.set(desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.left, 0, + bounds.set(desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.left, + getSearchBarTopOffset(), availableWidthPx - (desiredWorkspaceLeftRightMarginPx - defaultWidgetPadding.right), searchBarVisible ? searchBarSpaceHeightPx : edgeMarginPx); } |