diff options
author | Winson Chung <winsonc@google.com> | 2013-09-27 11:44:58 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-09-27 11:44:58 -0700 |
commit | 54e65135548818cb2fa8522b27df92c0aaa3e4a7 (patch) | |
tree | ac166964f0597e1d81d5f09ce4f080760ad15ddd /src/com/android/launcher3/DynamicGrid.java | |
parent | a6125efb66dd7554f2a84804baf6cc02a1334f20 (diff) | |
download | android_packages_apps_Trebuchet-54e65135548818cb2fa8522b27df92c0aaa3e4a7.tar.gz android_packages_apps_Trebuchet-54e65135548818cb2fa8522b27df92c0aaa3e4a7.tar.bz2 android_packages_apps_Trebuchet-54e65135548818cb2fa8522b27df92c0aaa3e4a7.zip |
Ensuring that Launcher always has a search bar. (Bug 10965514)
- Also disabling voice proxy when we are in now (Bug 10915381)
Change-Id: I4ad6392b5139d12b9b298110109b9363ba426cb4
Diffstat (limited to 'src/com/android/launcher3/DynamicGrid.java')
-rw-r--r-- | src/com/android/launcher3/DynamicGrid.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index 0756c88b7..33eb595ef 100644 --- a/src/com/android/launcher3/DynamicGrid.java +++ b/src/com/android/launcher3/DynamicGrid.java @@ -359,14 +359,14 @@ class DeviceProfile { boolean hasVerticalBarLayout = isVerticalBarLayout(); // Layout the search bar space - View searchBarSpace = launcher.findViewById(R.id.qsb_bar); - lp = (FrameLayout.LayoutParams) searchBarSpace.getLayoutParams(); + View searchBar = launcher.getSearchBar(); + lp = (FrameLayout.LayoutParams) searchBar.getLayoutParams(); if (hasVerticalBarLayout) { // Vertical search bar lp.gravity = Gravity.TOP | Gravity.LEFT; lp.width = searchBarSpaceHeightPx; lp.height = LayoutParams.MATCH_PARENT; - searchBarSpace.setPadding( + searchBar.setPadding( 0, 2 * edgeMarginPx, 0, 2 * edgeMarginPx); } else { @@ -374,19 +374,19 @@ class DeviceProfile { lp.gravity = Gravity.TOP | Gravity.CENTER_HORIZONTAL; lp.width = searchBarSpaceWidthPx; lp.height = searchBarSpaceHeightPx; - searchBarSpace.setPadding( + searchBar.setPadding( 2 * edgeMarginPx, 2 * edgeMarginPx, 2 * edgeMarginPx, 0); } - searchBarSpace.setLayoutParams(lp); + searchBar.setLayoutParams(lp); // Layout the search bar - View searchBar = launcher.getQsbBar(); - lp = (FrameLayout.LayoutParams) searchBar.getLayoutParams(); - lp.width = LayoutParams.MATCH_PARENT; - lp.height = LayoutParams.MATCH_PARENT; - searchBar.setLayoutParams(lp); + View qsbBar = launcher.getQsbBar(); + LayoutParams vglp = qsbBar.getLayoutParams(); + vglp.width = LayoutParams.MATCH_PARENT; + vglp.height = LayoutParams.MATCH_PARENT; + qsbBar.setLayoutParams(vglp); // Layout the voice proxy View voiceButtonProxy = launcher.findViewById(R.id.voice_button_proxy); |