From 0e947fbdbb49d2d58b4d1719224ded4c3f18707a Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Fri, 19 May 2017 12:21:50 -0700 Subject: [PATCH] Making some methods accessible Bug: 37616877 Change-Id: I22ed43d9a39d321757d7c2fde7754b95a44780e2 --- src/com/android/launcher3/AllAppsList.java | 10 ++++------ src/com/android/launcher3/LauncherModel.java | 2 +- src/com/android/launcher3/Utilities.java | 2 +- .../allapps/search/DefaultAppSearchAlgorithm.java | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/com/android/launcher3/AllAppsList.java b/src/com/android/launcher3/AllAppsList.java index d7f0180fa2..f3202beb94 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 data = - new ArrayList(DEFAULT_APPLICATIONS_NUMBER); + public final ArrayList data = new ArrayList<>(DEFAULT_APPLICATIONS_NUMBER); /** The list of apps that have been added since the last notify() call. */ - public ArrayList added = - new ArrayList(DEFAULT_APPLICATIONS_NUMBER); + public ArrayList added = new ArrayList<>(DEFAULT_APPLICATIONS_NUMBER); /** The list of apps that have been removed since the last notify() call. */ - public ArrayList removed = new ArrayList(); + public ArrayList removed = new ArrayList<>(); /** The list of apps that have been modified since the last notify() call. */ - public ArrayList modified = new ArrayList(); + public ArrayList modified = new ArrayList<>(); private IconCache mIconCache; diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index ca9f3120d6..e2311b584c 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 54e7dd2bcb..b006453c2e 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 457b454ef5..06097d0e64 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 getTitleMatchResult(String query) { + public ArrayList 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();