diff options
4 files changed, 8 insertions, 10 deletions
diff --git a/src/com/android/launcher3/AllAppsList.java b/src/com/android/launcher3/AllAppsList.java index d7f0180fa..f3202beb9 100644 --- a/src/com/android/launcher3/AllAppsList.java +++ b/src/com/android/launcher3/AllAppsList.java @@ -42,15 +42,13 @@ public class AllAppsList { public static final int DEFAULT_APPLICATIONS_NUMBER = 42; /** The list off all apps. */ - public ArrayList<AppInfo> data = - new ArrayList<AppInfo>(DEFAULT_APPLICATIONS_NUMBER); + public final ArrayList<AppInfo> data = new ArrayList<>(DEFAULT_APPLICATIONS_NUMBER); /** The list of apps that have been added since the last notify() call. */ - public ArrayList<AppInfo> added = - new ArrayList<AppInfo>(DEFAULT_APPLICATIONS_NUMBER); + public ArrayList<AppInfo> added = new ArrayList<>(DEFAULT_APPLICATIONS_NUMBER); /** The list of apps that have been removed since the last notify() call. */ - public ArrayList<AppInfo> removed = new ArrayList<AppInfo>(); + public ArrayList<AppInfo> removed = new ArrayList<>(); /** The list of apps that have been modified since the last notify() call. */ - public ArrayList<AppInfo> modified = new ArrayList<AppInfo>(); + public ArrayList<AppInfo> modified = new ArrayList<>(); private IconCache mIconCache; diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index ca9f3120d..e2311b584 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1831,7 +1831,7 @@ public class LauncherModel extends BroadcastReceiver CacheDataUpdatedTask.OP_CACHE_UPDATE, user, updatedPackages)); } - void enqueueModelUpdateTask(BaseModelUpdateTask task) { + public void enqueueModelUpdateTask(BaseModelUpdateTask task) { if (!mModelLoaded && mLoaderTask == null) { if (DEBUG_LOADERS) { Log.d(TAG, "enqueueModelUpdateTask Ignoring task since loader is pending=" + task); diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 54e7dd2bc..b006453c2 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -259,7 +259,7 @@ public final class Utilities { return scale; } - static boolean isSystemApp(Context context, Intent intent) { + public static boolean isSystemApp(Context context, Intent intent) { PackageManager pm = context.getPackageManager(); ComponentName cn = intent.getComponent(); String packageName = null; diff --git a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java index 457b454ef..06097d0e6 100644 --- a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java +++ b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java @@ -54,7 +54,7 @@ public class DefaultAppSearchAlgorithm { }); } - protected ArrayList<ComponentKey> getTitleMatchResult(String query) { + public ArrayList<ComponentKey> getTitleMatchResult(String query) { // Do an intersection of the words in the query and each title, and filter out all the // apps that don't match all of the words in the query. final String queryTextLower = query.toLowerCase(); @@ -67,7 +67,7 @@ public class DefaultAppSearchAlgorithm { return result; } - protected boolean matches(AppInfo info, String query) { + public boolean matches(AppInfo info, String query) { int queryLength = query.length(); String title = info.title.toString(); |