diff options
-rw-r--r-- | res/drawable-hdpi/ic_home_all_apps_holo_dark.png | bin | 1385 -> 1312 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_home_all_apps_holo_dark.png | bin | 877 -> 1003 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_home_all_apps_holo_dark.png | bin | 1658 -> 1548 bytes | |||
-rw-r--r-- | res/layout-sw600dp/search_bar.xml | 18 | ||||
-rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 9 |
5 files changed, 10 insertions, 17 deletions
diff --git a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png Binary files differindex 18a524b1c..1533a158b 100644 --- a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png diff --git a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png Binary files differindex 23616d457..ebbc7929e 100644 --- a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png diff --git a/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png Binary files differindex dff3e1645..61d9b55cc 100644 --- a/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png diff --git a/res/layout-sw600dp/search_bar.xml b/res/layout-sw600dp/search_bar.xml index b85263250..ebaf96001 100644 --- a/res/layout-sw600dp/search_bar.xml +++ b/res/layout-sw600dp/search_bar.xml @@ -56,10 +56,9 @@ android:contentDescription="@string/accessibility_voice_search_button" /> <!-- AppsCustomize icon --> - <com.android.launcher2.StrokedTextView + <com.android.launcher2.HolographicImageView android:id="@+id/all_apps_button" android:onClick="onClickAllAppsButton" - android:drawableLeft="@drawable/ic_home_all_apps_holo_dark" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" @@ -69,20 +68,7 @@ android:paddingRight="@dimen/toolbar_button_horizontal_padding" android:paddingTop="@dimen/all_apps_button_vertical_padding" android:paddingBottom="@dimen/all_apps_button_vertical_padding" - android:background="?android:attr/selectableItemBackground" - - android:gravity="center" - android:textColor="#CCFFFFFF" - android:textSize="18sp" - - launcher:strokeColor="#991e3157" - launcher:strokeTextColor="#DDFFFFFF" - launcher:strokeWidth="2.5" - - android:shadowColor="#DA000000" - android:shadowDx="0.0" - android:shadowDy="0.0" - android:shadowRadius="2.5" + android:src="@drawable/ic_home_all_apps_holo_dark" android:focusable="true" android:clickable="true" diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 5382ef3be..cde0b4b2d 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -460,7 +460,14 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen AppWidgetManager.getInstance(mLauncher).getInstalledProviders(); Intent shortcutsIntent = new Intent(Intent.ACTION_CREATE_SHORTCUT); List<ResolveInfo> shortcuts = mPackageManager.queryIntentActivities(shortcutsIntent, 0); - mWidgets.addAll(widgets); + for (AppWidgetProviderInfo widget : widgets) { + if (widget.minWidth > 0 && widget.minHeight > 0) { + mWidgets.add(widget); + } else { + Log.e(LOG_TAG, "Widget " + widget.provider + " has invalid dimensions (" + + widget.minWidth + ", " + widget.minHeight + ")"); + } + } mWidgets.addAll(shortcuts); Collections.sort(mWidgets, new LauncherModel.WidgetAndShortcutNameComparator(mPackageManager)); |