openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolved conflicts for merge of ebfae6e2 to ub-launcher3-master 

Change-Id: I1e0d5f1140e910b68322c4f5061d0a3c383899f0
This commit is contained in:
Sunny Goyal 2015-08-27 16:47:13 -07:00
parent bcd2874ab9 ebfae6e266
commit fafd4c276e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/config.xml
View File

@ -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" />

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

@ -198,8 +198,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";
@ -658,10 +656,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);
}
@ -3467,9 +3462,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);
}