diff options
Diffstat (limited to 'src/com/android/launcher3/util')
3 files changed, 97 insertions, 6 deletions
diff --git a/src/com/android/launcher3/util/CursorIconInfo.java b/src/com/android/launcher3/util/CursorIconInfo.java index 120eacd0a..4fefa986e 100644 --- a/src/com/android/launcher3/util/CursorIconInfo.java +++ b/src/com/android/launcher3/util/CursorIconInfo.java @@ -34,13 +34,24 @@ public class CursorIconInfo { public final int iconResourceIndex; public final int iconIndex; - public CursorIconInfo(Cursor c) { + public final int titleIndex; + + private final Context mContext; + + public CursorIconInfo(Context context, Cursor c) { + mContext = context; + iconIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON); iconPackageIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON_PACKAGE); iconResourceIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.ICON_RESOURCE); + + titleIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.TITLE); } - public Bitmap loadIcon(Cursor c, ShortcutInfo info, Context context) { + /** + * Loads the icon from the cursor and updates the {@param info} if the icon is an app resource. + */ + public Bitmap loadIcon(Cursor c, ShortcutInfo info) { Bitmap icon = null; String packageName = c.getString(iconPackageIndex); String resourceName = c.getString(iconResourceIndex); @@ -48,12 +59,27 @@ public class CursorIconInfo { info.iconResource = new ShortcutIconResource(); info.iconResource.packageName = packageName; info.iconResource.resourceName = resourceName; - icon = Utilities.createIconBitmap(packageName, resourceName, context); + icon = Utilities.createIconBitmap(packageName, resourceName, mContext); } if (icon == null) { // Failed to load from resource, try loading from DB. - icon = Utilities.createIconBitmap(c, iconIndex, context); + icon = loadIcon(c); } return icon; } + + /** + * Loads the fixed bitmap from the icon if available. + */ + public Bitmap loadIcon(Cursor c) { + return Utilities.createIconBitmap(c, iconIndex, mContext); + } + + /** + * Returns the title or empty string + */ + public String getTitle(Cursor c) { + String title = c.getString(titleIndex); + return TextUtils.isEmpty(title) ? "" : Utilities.trim(c.getString(titleIndex)); + } } diff --git a/src/com/android/launcher3/util/ItemInfoMatcher.java b/src/com/android/launcher3/util/ItemInfoMatcher.java new file mode 100644 index 000000000..6189bf2f4 --- /dev/null +++ b/src/com/android/launcher3/util/ItemInfoMatcher.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.util; + +import android.content.ComponentName; + +import com.android.launcher3.ItemInfo; +import com.android.launcher3.LauncherSettings.Favorites; +import com.android.launcher3.compat.UserHandleCompat; +import com.android.launcher3.shortcuts.ShortcutKey; + +import java.util.HashSet; + +/** + * A utility class to check for {@link ItemInfo} + */ +public abstract class ItemInfoMatcher { + + public abstract boolean matches(ItemInfo info, ComponentName cn); + + public static ItemInfoMatcher ofComponents( + final HashSet<ComponentName> components, final UserHandleCompat user) { + return new ItemInfoMatcher() { + @Override + public boolean matches(ItemInfo info, ComponentName cn) { + return components.contains(cn) && info.user.equals(user); + } + }; + } + + public static ItemInfoMatcher ofPackages( + final HashSet<String> packageNames, final UserHandleCompat user) { + return new ItemInfoMatcher() { + @Override + public boolean matches(ItemInfo info, ComponentName cn) { + return packageNames.contains(cn.getPackageName()) && info.user.equals(user); + } + }; + } + + public static ItemInfoMatcher ofShortcutKeys(final HashSet<ShortcutKey> keys) { + return new ItemInfoMatcher() { + @Override + public boolean matches(ItemInfo info, ComponentName cn) { + return info.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT && + keys.contains(ShortcutKey.fromItemInfo(info)); + } + }; + } +} diff --git a/src/com/android/launcher3/util/WallpaperOffsetInterpolator.java b/src/com/android/launcher3/util/WallpaperOffsetInterpolator.java index d7b391427..392697458 100644 --- a/src/com/android/launcher3/util/WallpaperOffsetInterpolator.java +++ b/src/com/android/launcher3/util/WallpaperOffsetInterpolator.java @@ -208,8 +208,9 @@ public class WallpaperOffsetInterpolator implements Choreographer.FrameCallback scheduleUpdate(); mFinalOffset = Math.max(0f, Math.min(x, 1f)); if (getNumScreensExcludingEmptyAndCustom() != mNumScreens) { - if (mNumScreens > 0) { - // Don't animate if we're going from 0 screens + if (mNumScreens > 0 && Float.compare(mCurrentOffset, mFinalOffset) != 0) { + // Don't animate if we're going from 0 screens, or if the final offset is the same + // as the current offset animateToFinal(); } mNumScreens = getNumScreensExcludingEmptyAndCustom(); |