diff options
author | Rajeev Kumar <rajekumar@google.com> | 2017-06-13 17:42:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-13 17:42:53 +0000 |
commit | 7847d10f389425a92e11b29f181acbbebc8b1dab (patch) | |
tree | 70411484251f572a199c5fe5ce6dc7110954f39a /src/com/android/launcher3/provider/ImportDataTask.java | |
parent | ef66cdbca4baa405df5d4163f362dc10e0ecf93e (diff) | |
parent | 0590a4c0cec8095dc299f1cacfe27a98f11a83b5 (diff) | |
download | android_packages_apps_Trebuchet-7847d10f389425a92e11b29f181acbbebc8b1dab.tar.gz android_packages_apps_Trebuchet-7847d10f389425a92e11b29f181acbbebc8b1dab.tar.bz2 android_packages_apps_Trebuchet-7847d10f389425a92e11b29f181acbbebc8b1dab.zip |
Merge "Replace use of java.util.HashMap with android.util.ArrayMap in AutoInstallsLayout, DefaultLayoutParser, ImportDataTask classes." into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com/android/launcher3/provider/ImportDataTask.java')
-rw-r--r-- | src/com/android/launcher3/provider/ImportDataTask.java | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/com/android/launcher3/provider/ImportDataTask.java b/src/com/android/launcher3/provider/ImportDataTask.java index 314f24417..b83d3c0cd 100644 --- a/src/com/android/launcher3/provider/ImportDataTask.java +++ b/src/com/android/launcher3/provider/ImportDataTask.java @@ -31,9 +31,9 @@ import android.database.sqlite.SQLiteDatabase; import android.net.Uri; import android.os.Process; import android.text.TextUtils; +import android.util.ArrayMap; import android.util.LongSparseArray; import android.util.SparseBooleanArray; - import com.android.launcher3.AutoInstallsLayout.LayoutParserCallback; import com.android.launcher3.DefaultLayoutParser; import com.android.launcher3.LauncherAppState; @@ -51,10 +51,8 @@ import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.logging.FileLog; import com.android.launcher3.model.GridSizeMigrationTask; import com.android.launcher3.util.LongArrayMap; - import java.net.URISyntaxException; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; /** @@ -134,7 +132,7 @@ public class ImportDataTask { String profileId = Long.toString(UserManagerCompat.getInstance(mContext) .getSerialNumberForUser(Process.myUserHandle())); - boolean createEmptyRowOnFirstScreen = false; + boolean createEmptyRowOnFirstScreen; if (FeatureFlags.QSB_ON_FIRST_SCREEN) { try (Cursor c = mContext.getContentResolver().query(mOtherFavoritesUri, null, // get items on the first row of the first screen @@ -326,9 +324,9 @@ public class ImportDataTask { } } - private static final String getPackage(Intent intent) { + private static String getPackage(Intent intent) { return intent.getComponent() != null ? intent.getComponent().getPackageName() - : intent.getPackage(); + : intent.getPackage(); } /** @@ -378,7 +376,7 @@ public class ImportDataTask { return false; } - private static final int getMyHotseatLayoutId(Context context) { + private static int getMyHotseatLayoutId(Context context) { return LauncherAppState.getIDP(context).numHotseatIcons <= 5 ? R.xml.dw_phone_hotseat : R.xml.dw_tablet_hotseat; @@ -393,9 +391,9 @@ public class ImportDataTask { } @Override - protected HashMap<String, TagParser> getLayoutElementsMap() { + protected ArrayMap<String, TagParser> getLayoutElementsMap() { // Only allow shortcut parsers - HashMap<String, TagParser> parsers = new HashMap<String, TagParser>(); + ArrayMap<String, TagParser> parsers = new ArrayMap<>(); parsers.put(TAG_FAVORITE, new AppShortcutWithUriParser()); parsers.put(TAG_SHORTCUT, new UriShortcutParser(mSourceRes)); parsers.put(TAG_RESOLVE, new ResolveParser()); @@ -407,7 +405,7 @@ public class ImportDataTask { * {@link LayoutParserCallback} which adds items in empty hotseat spots. */ private static class HotseatParserCallback implements LayoutParserCallback { - private final HashSet<String> mExisitingApps; + private final HashSet<String> mExistingApps; private final LongArrayMap<Object> mExistingItems; private final ArrayList<ContentProviderOperation> mOutOps; private final int mRequiredSize; @@ -416,7 +414,7 @@ public class ImportDataTask { HotseatParserCallback( HashSet<String> existingApps, LongArrayMap<Object> existingItems, ArrayList<ContentProviderOperation> outOps, int startItemId, int requiredSize) { - mExisitingApps = existingApps; + mExistingApps = existingApps; mExistingItems = existingItems; mOutOps = outOps; mRequiredSize = requiredSize; @@ -441,11 +439,11 @@ public class ImportDataTask { return 0; } String pkg = getPackage(intent); - if (pkg == null || mExisitingApps.contains(pkg)) { + if (pkg == null || mExistingApps.contains(pkg)) { // The item does not target an app or is already in hotseat. return 0; } - mExisitingApps.add(pkg); + mExistingApps.add(pkg); // find next vacant spot. long screen = 0; |