diff options
author | Sameer Padala <sxp@google.com> | 2014-08-11 19:51:55 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-11 18:26:04 +0000 |
commit | 056cf62bbb0edc46199b3791861caf4249da3ed5 (patch) | |
tree | c13a0d865da1a6696a74965eff21374d9eea1c2b /src/com | |
parent | 6551b7ef07b4d73c096cbfb22002e080b498cbbb (diff) | |
parent | 65c6011d0954223c14a0e6127cf307c18f7c2c0d (diff) | |
download | android_packages_apps_Trebuchet-056cf62bbb0edc46199b3791861caf4249da3ed5.tar.gz android_packages_apps_Trebuchet-056cf62bbb0edc46199b3791861caf4249da3ed5.tar.bz2 android_packages_apps_Trebuchet-056cf62bbb0edc46199b3791861caf4249da3ed5.zip |
Merge "Update code so it compiles on google3" into ub-now-porkchop
Diffstat (limited to 'src/com')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index c8f2f33fb..e852ec79b 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -4869,7 +4869,7 @@ public class Workspace extends SmoothPagedView } public void updatePackageState(ArrayList<PackageInstallInfo> installInfos) { - HashSet<String> completedPackages = new HashSet<>(); + HashSet<String> completedPackages = new HashSet<String>(); for (final PackageInstallInfo installInfo : installInfos) { mapOverItems(MAP_RECURSE, new ItemOperator() { diff --git a/src/com/android/launcher3/compat/PackageInstallerCompatV16.java b/src/com/android/launcher3/compat/PackageInstallerCompatV16.java index 653a88c7d..6a2a02e48 100644 --- a/src/com/android/launcher3/compat/PackageInstallerCompatV16.java +++ b/src/com/android/launcher3/compat/PackageInstallerCompatV16.java @@ -86,7 +86,7 @@ public class PackageInstallerCompatV16 extends PackageInstallerCompat { return; } mReplayPending = false; - ArrayList<PackageInstallInfo> updates = new ArrayList<>(); + ArrayList<PackageInstallInfo> updates = new ArrayList<PackageInstallInfo>(); for (String packageName: mPrefs.getAll().keySet()) { final String json = mPrefs.getString(packageName, null); if (!TextUtils.isEmpty(json)) { @@ -125,7 +125,7 @@ public class PackageInstallerCompatV16 extends PackageInstallerCompat { replayUpdates(); } else { LauncherAppState app = LauncherAppState.getInstanceNoCreate(); - ArrayList<PackageInstallInfo> update = new ArrayList<>(); + ArrayList<PackageInstallInfo> update = new ArrayList<PackageInstallInfo>(); update.add(installInfo); sendUpdate(app, update); } diff --git a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java index 7f6302f14..26e1b7c00 100644 --- a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java +++ b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java @@ -33,7 +33,7 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat { private static final String TAG = "PackageInstallerCompatVL"; private static final boolean DEBUG = false; - private final SparseArray<InstallSessionInfo> mPendingReplays = new SparseArray<>(); + private final SparseArray<InstallSessionInfo> mPendingReplays = new SparseArray<InstallSessionInfo>(); private final PackageInstaller mInstaller; private boolean mResumed; @@ -97,7 +97,7 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat { return; } - ArrayList<PackageInstallInfo> updates = new ArrayList<>(); + ArrayList<PackageInstallInfo> updates = new ArrayList<PackageInstallInfo>(); if (newInfo != null) { updates.add(newInfo); } |