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/DefaultLayoutParser.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/DefaultLayoutParser.java')
-rw-r--r-- | src/com/android/launcher3/DefaultLayoutParser.java | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/com/android/launcher3/DefaultLayoutParser.java b/src/com/android/launcher3/DefaultLayoutParser.java index 05911ab7f..1ec30ba68 100644 --- a/src/com/android/launcher3/DefaultLayoutParser.java +++ b/src/com/android/launcher3/DefaultLayoutParser.java @@ -13,18 +13,15 @@ import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.os.Bundle; import android.text.TextUtils; +import android.util.ArrayMap; import android.util.Log; - import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.util.Thunk; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - import java.io.IOException; import java.net.URISyntaxException; -import java.util.HashMap; import java.util.List; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; /** * Implements the layout parser with rules for internal layouts and partner layouts. @@ -55,20 +52,20 @@ public class DefaultLayoutParser extends AutoInstallsLayout { } @Override - protected HashMap<String, TagParser> getFolderElementsMap() { + protected ArrayMap<String, TagParser> getFolderElementsMap() { return getFolderElementsMap(mSourceRes); } - @Thunk HashMap<String, TagParser> getFolderElementsMap(Resources res) { - HashMap<String, TagParser> parsers = new HashMap<String, TagParser>(); + @Thunk ArrayMap<String, TagParser> getFolderElementsMap(Resources res) { + ArrayMap<String, TagParser> parsers = new ArrayMap<>(); parsers.put(TAG_FAVORITE, new AppShortcutWithUriParser()); parsers.put(TAG_SHORTCUT, new UriShortcutParser(res)); return parsers; } @Override - 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_FAVORITE, new AppShortcutWithUriParser()); parsers.put(TAG_APPWIDGET, new AppWidgetParser()); parsers.put(TAG_SHORTCUT, new UriShortcutParser(mSourceRes)); |