resolved conflicts for merge of ebfae6e2 to ub-launcher3-master
Change-Id: I1e0d5f1140e910b68322c4f5061d0a3c383899f0
diff --git a/res/values/config.xml b/res/values/config.xml
index 6a67840..79ae517 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -73,6 +73,9 @@
filter the activities shown in the launcher. Can be empty. -->
<string name="app_filter_class" translatable="false"></string>
+ <!-- View ID to use for QSB widget -->
+ <item type="id" name="qsb_widget" />
+
<!-- Accessibility actions -->
<item type="id" name="action_remove" />
<item type="id" name="action_uninstall" />
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 1b4ac7a..8024233 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -198,8 +198,6 @@
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";
@@ -658,10 +656,7 @@
public int getViewIdForItem(ItemInfo info) {
// This cast is safe given the > 2B range for int.
- return getViewIdForItemId((int) info.id);
- }
-
- public int getViewIdForItemId(int itemId) {
+ int itemId = (int) info.id;
if (mItemIdToViewId.containsKey(itemId)) {
return mItemIdToViewId.get(itemId);
}
@@ -3467,9 +3462,9 @@
mAppWidgetHost.setQsbWidgetId(widgetId);
if (widgetId != -1) {
mQsb = mAppWidgetHost.createView(this, widgetId, searchProvider);
+ mQsb.setId(R.id.qsb_widget);
mQsb.updateAppWidgetOptions(opts);
mQsb.setPadding(0, 0, 0, 0);
- mQsb.setId(getViewIdForItemId(QSB_ITEM_ID));
mSearchDropTargetBar.addView(mQsb);
mSearchDropTargetBar.setQsbSearchBar(mQsb);
}