diff options
| author | Roman Birg <roman@cyngn.com> | 2015-07-02 13:11:31 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-07-28 10:32:39 -0700 |
| commit | cfe3474f48fc2255bfe0135648c48afc594462c8 (patch) | |
| tree | 4eea2a1b953bb3791a7b1eb03330d1553cfd2ac3 /src/com/android/launcher3/DeviceProfile.java | |
| parent | 34dbd4ad06b87fafec5b2bd2745eb283018d1bcf (diff) | |
| download | android_packages_apps_Trebuchet-cfe3474f48fc2255bfe0135648c48afc594462c8.tar.gz android_packages_apps_Trebuchet-cfe3474f48fc2255bfe0135648c48afc594462c8.tar.bz2 android_packages_apps_Trebuchet-cfe3474f48fc2255bfe0135648c48afc594462c8.zip | |
Trebuchet: display search widget search box if available
Ported to CAF
Conflicts:
src/com/android/launcher3/Launcher.java
Change-Id: I3a6d930f25ca4ac1eb8a069c68a2fe9bf2aeb646
Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'src/com/android/launcher3/DeviceProfile.java')
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 9bdfcf41b..a052fe630 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -588,7 +588,7 @@ public class DeviceProfile { if (isTablet() && !isVerticalBarLayout()) { return searchBarVisible ? 4 * edgeMarginPx : 0; } else { - return searchBarVisible ? 2 * edgeMarginPx : 0; + return searchBarVisible ? edgeMarginPx : 0; } } @@ -811,9 +811,13 @@ public class DeviceProfile { lp.width = searchBarSpaceWidthPx; lp.height = searchBarSpaceHeightPx; searchBar.setPadding( - 2 * edgeMarginPx, + edgeMarginPx, getSearchBarTopOffset(), - 2 * edgeMarginPx, 0); + edgeMarginPx, edgeMarginPx); + } + if (launcher.mSearchWidgetId >= 0) { + // remove padding on widget + searchBar.setPadding(0, 0, 0, 0); } searchBar.setLayoutParams(lp); |