summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/util
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-07-28 12:11:54 -0700
committerSunny Goyal <sunnygoyal@google.com>2016-07-29 16:10:31 -0700
commitd3b87ef1963fb96177ca85bcd6a25879e27e419c (patch)
treef334d5aa2b24626cba47ec1936264a08e385a4b5 /src/com/android/launcher3/util
parentc42087e5c011dbf912c0f8b8d27d15ec5a97dca1 (diff)
downloadandroid_packages_apps_Trebuchet-d3b87ef1963fb96177ca85bcd6a25879e27e419c.tar.gz
android_packages_apps_Trebuchet-d3b87ef1963fb96177ca85bcd6a25879e27e419c.tar.bz2
android_packages_apps_Trebuchet-d3b87ef1963fb96177ca85bcd6a25879e27e419c.zip
Adding quiet mode support for shortcuts
> LauncherApps returns empty list when the user is locked. Not relying on LauncherApps in this case > When the user is locked, removing all dynamic shortcuts > Loading shortcuts from DB when the user is locked > Verifying the shortcuts again when the user is available Bug: 30411561 Change-Id: Ib6eb372c5b009cadb86a8f6e781f3f3cbf787ceb
Diffstat (limited to 'src/com/android/launcher3/util')
-rw-r--r--src/com/android/launcher3/util/CursorIconInfo.java34
-rw-r--r--src/com/android/launcher3/util/ItemInfoMatcher.java64
2 files changed, 94 insertions, 4 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));
+ }
+ };
+ }
+}