diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-09-19 19:50:25 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-19 19:50:26 +0000 |
commit | 66af82cca76b313366e5429489aed85679c2c76e (patch) | |
tree | 59bf420eb2561d88743e90f2d499b4ec4080cad1 /src/com/android/launcher3/compat | |
parent | 92e97dccab3d7016e0740648e1d467e37a42f3f8 (diff) | |
parent | 9448536b113afa6ceefce26604a1b44618d1d4f2 (diff) | |
download | android_packages_apps_Trebuchet-66af82cca76b313366e5429489aed85679c2c76e.tar.gz android_packages_apps_Trebuchet-66af82cca76b313366e5429489aed85679c2c76e.tar.bz2 android_packages_apps_Trebuchet-66af82cca76b313366e5429489aed85679c2c76e.zip |
Merge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop
Diffstat (limited to 'src/com/android/launcher3/compat')
3 files changed, 16 insertions, 5 deletions
diff --git a/src/com/android/launcher3/compat/PackageInstallerCompat.java b/src/com/android/launcher3/compat/PackageInstallerCompat.java index 03857e693..0eb8754e8 100644 --- a/src/com/android/launcher3/compat/PackageInstallerCompat.java +++ b/src/com/android/launcher3/compat/PackageInstallerCompat.java @@ -20,6 +20,8 @@ import android.content.Context; import com.android.launcher3.Utilities; +import java.util.HashSet; + public abstract class PackageInstallerCompat { public static final int STATUS_INSTALLED = 0; @@ -42,7 +44,7 @@ public abstract class PackageInstallerCompat { } } - public abstract void updateActiveSessionCache(); + public abstract HashSet<String> updateAndGetActiveSessionCache(); public abstract void onPause(); diff --git a/src/com/android/launcher3/compat/PackageInstallerCompatV16.java b/src/com/android/launcher3/compat/PackageInstallerCompatV16.java index 4cc6fc12f..1910d22ae 100644 --- a/src/com/android/launcher3/compat/PackageInstallerCompatV16.java +++ b/src/com/android/launcher3/compat/PackageInstallerCompatV16.java @@ -29,6 +29,7 @@ import org.json.JSONStringer; import org.json.JSONTokener; import java.util.ArrayList; +import java.util.HashSet; public class PackageInstallerCompatV16 extends PackageInstallerCompat { @@ -76,9 +77,6 @@ public class PackageInstallerCompatV16 extends PackageInstallerCompat { @Override public void onStop() { } - @Override - public void updateActiveSessionCache() { } - private void replayUpdates() { if (DEBUG) Log.d(TAG, "updates resumed"); LauncherAppState app = LauncherAppState.getInstanceNoCreate(); @@ -169,4 +167,9 @@ public class PackageInstallerCompatV16 extends PackageInstallerCompat { } return value; } + + @Override + public HashSet<String> updateAndGetActiveSessionCache() { + return new HashSet<String>(); + } } diff --git a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java index 2d56adf91..daacba834 100644 --- a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java +++ b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java @@ -27,6 +27,7 @@ import com.android.launcher3.IconCache; import com.android.launcher3.LauncherAppState; import java.util.ArrayList; +import java.util.HashSet; public class PackageInstallerCompatVL extends PackageInstallerCompat { @@ -57,11 +58,16 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat { } @Override - public void updateActiveSessionCache() { + public HashSet<String> updateAndGetActiveSessionCache() { + HashSet<String> activePackages = new HashSet<String>(); UserHandleCompat user = UserHandleCompat.myUserHandle(); for (SessionInfo info : mInstaller.getAllSessions()) { addSessionInfoToCahce(info, user); + if (info.getAppPackageName() != null) { + activePackages.add(info.getAppPackageName()); + } } + return activePackages; } private void addSessionInfoToCahce(SessionInfo info, UserHandleCompat user) { |