am 195a2983: Merge "Adding viewId for the QSB" into ub-launcher3-burnaby (bcd2874a) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+7 −1

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

		private static final String QSB_WIDGET_ID = "qsb_widget_id";
		private static final String QSB_WIDGET_PROVIDER = "qsb_widget_provider";
		// Item id to use for QSB widget.
		private static final int QSB_ITEM_ID = -1;

		public static final String USER_HAS_MIGRATED = "launcher.user_migrated_from_old_data";

		@@ -656,7 +658,10 @@ public class Launcher extends Activity

		public int getViewIdForItem(ItemInfo info) {
		// This cast is safe given the > 2B range for int.
		int itemId = (int) info.id;
		return getViewIdForItemId((int) info.id);
		}

		public int getViewIdForItemId(int itemId) {
		if (mItemIdToViewId.containsKey(itemId)) {
		return mItemIdToViewId.get(itemId);
		}
		@@ -3464,6 +3469,7 @@ public class Launcher extends Activity
		mQsb = mAppWidgetHost.createView(this, widgetId, searchProvider);
		mQsb.updateAppWidgetOptions(opts);
		mQsb.setPadding(0, 0, 0, 0);
		mQsb.setId(getViewIdForItemId(QSB_ITEM_ID));
		mSearchDropTargetBar.addView(mQsb);
		mSearchDropTargetBar.setQsbSearchBar(mQsb);
		}