Merge "Set search bar height before setting up views in Launcher." into ub-launcher3-burnaby-polish (52040c2d) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/DeviceProfile.java

+11 −9

Original line number	Diff line number	Diff line
		@@ -104,7 +104,6 @@ public class DeviceProfile {
		private int searchBarSpaceWidthPx;
		private int searchBarSpaceHeightNormalPx, searchBarSpaceHeightTallPx;
		private int searchBarSpaceHeightPx; // One of the above.
		private int searchBarHeight = LauncherCallbacks.SEARCH_BAR_HEIGHT_NORMAL;

		public DeviceProfile(Context context, InvariantDeviceProfile inv,
		Point minSize, Point maxSize,
		@@ -396,6 +395,17 @@ public class DeviceProfile {
		return visibleChildren;
		}

		// TODO(twickham): b/25154513
		public void setSearchBarHeight(int searchBarHeight) {
		if (searchBarHeight == LauncherCallbacks.SEARCH_BAR_HEIGHT_TALL) {
		hotseatBarHeightPx = hotseatBarHeightShortPx;
		searchBarSpaceHeightPx = searchBarSpaceHeightTallPx;
		} else {
		hotseatBarHeightPx = hotseatBarHeightNormalPx;
		searchBarSpaceHeightPx = searchBarSpaceHeightNormalPx;
		}
		}

		public void layout(Launcher launcher) {
		FrameLayout.LayoutParams lp;
		boolean hasVerticalBarLayout = isVerticalBarLayout();
		@@ -404,14 +414,6 @@ public class DeviceProfile {
		// Layout the search bar space
		View searchBar = launcher.getSearchDropTargetBar();
		lp = (FrameLayout.LayoutParams) searchBar.getLayoutParams();
		searchBarHeight = launcher.getSearchBarHeight();
		if (searchBarHeight == LauncherCallbacks.SEARCH_BAR_HEIGHT_TALL) {
		hotseatBarHeightPx = hotseatBarHeightShortPx;
		searchBarSpaceHeightPx = searchBarSpaceHeightTallPx;
		} else {
		hotseatBarHeightPx = hotseatBarHeightNormalPx;
		searchBarSpaceHeightPx = searchBarSpaceHeightNormalPx;
		}
		if (hasVerticalBarLayout) {
		// Vertical search bar space -- The search bar is fixed in the layout to be on the left
		// of the screen regardless of RTL

src/com/android/launcher3/Launcher.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -454,6 +454,8 @@ public class Launcher extends Activity

		setContentView(R.layout.launcher);

		app.getInvariantDeviceProfile().landscapeProfile.setSearchBarHeight(getSearchBarHeight());
		app.getInvariantDeviceProfile().portraitProfile.setSearchBarHeight(getSearchBarHeight());
		setupViews();
		mDeviceProfile.layout(this);

		@@ -3641,6 +3643,10 @@ public class Launcher extends Activity
		opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, minHeight);
		opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, maxWidth);
		opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, minWidth);
		if (LOGD) {
		Log.d(TAG, "QSB widget options: maxHeight=" + maxHeight + " minHeight=" + minHeight
		+ " maxWidth=" + maxWidth + " minWidth=" + minWidth);
		}

		if (mLauncherCallbacks != null) {
		opts.putAll(mLauncherCallbacks.getAdditionalSearchWidgetOptions());