diff options
author | Rajeev Kumar <rajekumar@google.com> | 2017-06-09 16:02:25 -0700 |
---|---|---|
committer | Rajeev Kumar <rajekumar@google.com> | 2017-06-09 16:03:32 -0700 |
commit | 26453a297b622011258dc6b32403ba6586f00996 (patch) | |
tree | 0ecc401dee64e595ec3e38c8ae97f5315743d3d8 /src/com/android/launcher3/AutoInstallsLayout.java | |
parent | 5188599a0fea3970db345951fbf38349a37db2d2 (diff) | |
download | android_packages_apps_Trebuchet-26453a297b622011258dc6b32403ba6586f00996.tar.gz android_packages_apps_Trebuchet-26453a297b622011258dc6b32403ba6586f00996.tar.bz2 android_packages_apps_Trebuchet-26453a297b622011258dc6b32403ba6586f00996.zip |
Replace use of java.util.HashMap with android.util.ArrayMap in
AutoInstallsLayout, DefaultLayoutParser, ImportDataTask
classes.
Change-Id: Idcf1f5f020132ddf43751067a38a64bfc088800e
Bug: 62466540
Diffstat (limited to 'src/com/android/launcher3/AutoInstallsLayout.java')
-rw-r--r-- | src/com/android/launcher3/AutoInstallsLayout.java | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/src/com/android/launcher3/AutoInstallsLayout.java b/src/com/android/launcher3/AutoInstallsLayout.java index 98eb208eb..d82579bf7 100644 --- a/src/com/android/launcher3/AutoInstallsLayout.java +++ b/src/com/android/launcher3/AutoInstallsLayout.java @@ -30,23 +30,20 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.text.TextUtils; +import android.util.ArrayMap; import android.util.Log; import android.util.Pair; import android.util.Patterns; - import com.android.launcher3.LauncherProvider.SqlArguments; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.graphics.LauncherIcons; import com.android.launcher3.util.Thunk; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.Locale; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; /** * Layout parsing code for auto installs layout @@ -83,7 +80,7 @@ public class AutoInstallsLayout { // Try with grid size and hotseat count String layoutName = String.format(Locale.ENGLISH, FORMATTED_LAYOUT_RES_WITH_HOSTEAT, - (int) grid.numColumns, (int) grid.numRows, (int) grid.numHotseatIcons); + grid.numColumns, grid.numRows, grid.numHotseatIcons); int layoutId = targetRes.getIdentifier(layoutName, "xml", pkg); // Try with only grid size @@ -91,7 +88,7 @@ public class AutoInstallsLayout { Log.d(TAG, "Formatted layout: " + layoutName + " not found. Trying layout without hosteat"); layoutName = String.format(Locale.ENGLISH, FORMATTED_LAYOUT_RES, - (int) grid.numColumns, (int) grid.numRows); + grid.numColumns, grid.numRows); layoutId = targetRes.getIdentifier(layoutName, "xml", pkg); } @@ -209,7 +206,7 @@ public class AutoInstallsLayout { beginDocument(parser, mRootTag); final int depth = parser.getDepth(); int type; - HashMap<String, TagParser> tagParserMap = getLayoutElementsMap(); + ArrayMap<String, TagParser> tagParserMap = getLayoutElementsMap(); int count = 0; while (((type = parser.next()) != XmlPullParser.END_TAG || @@ -243,10 +240,10 @@ public class AutoInstallsLayout { * Parses the current node and returns the number of elements added. */ protected int parseAndAddNode( - XmlResourceParser parser, - HashMap<String, TagParser> tagParserMap, - ArrayList<Long> screenIds) - throws XmlPullParserException, IOException { + XmlResourceParser parser, + ArrayMap<String, TagParser> tagParserMap, + ArrayList<Long> screenIds) + throws XmlPullParserException, IOException { if (TAG_INCLUDE.equals(parser.getName())) { final int resId = getAttributeResourceValue(parser, ATTR_WORKSPACE, 0); @@ -303,16 +300,16 @@ public class AutoInstallsLayout { } } - protected HashMap<String, TagParser> getFolderElementsMap() { - HashMap<String, TagParser> parsers = new HashMap<String, TagParser>(); + protected ArrayMap<String, TagParser> getFolderElementsMap() { + ArrayMap<String, TagParser> parsers = new ArrayMap<>(); parsers.put(TAG_APP_ICON, new AppShortcutParser()); parsers.put(TAG_AUTO_INSTALL, new AutoInstallParser()); parsers.put(TAG_SHORTCUT, new ShortcutParser(mSourceRes)); return parsers; } - protected HashMap<String, TagParser> getLayoutElementsMap() { - HashMap<String, TagParser> parsers = new HashMap<String, TagParser>(); + protected ArrayMap<String, TagParser> getLayoutElementsMap() { + ArrayMap<String, TagParser> parsers = new ArrayMap<>(); parsers.put(TAG_APP_ICON, new AppShortcutParser()); parsers.put(TAG_AUTO_INSTALL, new AutoInstallParser()); parsers.put(TAG_FOLDER, new FolderParser()); @@ -528,13 +525,13 @@ public class AutoInstallsLayout { } protected class FolderParser implements TagParser { - private final HashMap<String, TagParser> mFolderElements; + private final ArrayMap<String, TagParser> mFolderElements; public FolderParser() { this(getFolderElementsMap()); } - public FolderParser(HashMap<String, TagParser> elements) { + public FolderParser(ArrayMap<String, TagParser> elements) { mFolderElements = elements; } @@ -561,7 +558,7 @@ public class AutoInstallsLayout { } final ContentValues myValues = new ContentValues(mValues); - ArrayList<Long> folderItems = new ArrayList<Long>(); + ArrayList<Long> folderItems = new ArrayList<>(); int type; int folderDepth = parser.getDepth(); @@ -617,7 +614,7 @@ public class AutoInstallsLayout { } } - protected static final void beginDocument(XmlPullParser parser, String firstElementName) + protected static void beginDocument(XmlPullParser parser, String firstElementName) throws XmlPullParserException, IOException { int type; while ((type = parser.next()) != XmlPullParser.START_TAG @@ -671,7 +668,7 @@ public class AutoInstallsLayout { return value; } - public static interface LayoutParserCallback { + public interface LayoutParserCallback { long generateNewItemId(); long insertAndCheck(SQLiteDatabase db, ContentValues values); |