aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 00:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Adding viewId for the QSB"

Browse Source 
Using QSB widget id from xml

This reverts commit 9956859139.

Change-Id: I33c48cf074f2dc1cf509c2d9f1f19b40b91f6a22
This commit is contained in:
Sunny Goyal
2015-08-27 15:30:25 -07:00
parent 195a29834f
commit ebfae6e266
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/config.xml
View File

@@ -78,6 +78,9 @@
get build information. Can be empty. -->
<string name="build_info_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" />

9
src/com/android/launcher3/Launcher.java
View File

@@ -207,8 +207,6 @@ 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";
@@ -676,10 +674,7 @@ public class Launcher extends Activity
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);
}
@@ -3512,9 +3507,9 @@ public class Launcher extends Activity
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);
}