summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-07-08 19:24:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-08 17:33:57 +0000
commitd53027e4aadc6e92200bc18f3b29492713912fdd (patch)
tree0c6cd461ae211a84e497977ef147c4850b61675a /src/com
parent96bb79819ef9ddf2d1c0cb0b72c2c9f6db26b4fd (diff)
parent481c1fb796ea00d725b079a98cd6958247794a83 (diff)
downloadandroid_packages_apps_Trebuchet-d53027e4aadc6e92200bc18f3b29492713912fdd.tar.gz
android_packages_apps_Trebuchet-d53027e4aadc6e92200bc18f3b29492713912fdd.tar.bz2
android_packages_apps_Trebuchet-d53027e4aadc6e92200bc18f3b29492713912fdd.zip
Merge "Fixing icon disappearing when apps are moved to sdcard" into ub-now-master
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/compat/LauncherAppsCompatV16.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/launcher3/compat/LauncherAppsCompatV16.java b/src/com/android/launcher3/compat/LauncherAppsCompatV16.java
index f30c28b82..de9f3a032 100644
--- a/src/com/android/launcher3/compat/LauncherAppsCompatV16.java
+++ b/src/com/android/launcher3/compat/LauncherAppsCompatV16.java
@@ -174,13 +174,18 @@ public class LauncherAppsCompatV16 extends LauncherAppsCompat {
}
}
} else if (Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals(action)) {
- final boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
+ // EXTRA_REPLACING is available Kitkat onwards. For lower devices, it is broadcasted
+ // when moving a package or mounting/un-mounting external storage. Assume that
+ // it is a replacing operation.
+ final boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING,
+ Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT);
String[] packages = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST);
for (OnAppsChangedCallbackCompat callback : getCallbacks()) {
callback.onPackagesAvailable(packages, user, replacing);
}
} else if (Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(action)) {
- final boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
+ final boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING,
+ Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT);
String[] packages = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST);
for (OnAppsChangedCallbackCompat callback : getCallbacks()) {
callback.onPackagesUnavailable(packages, user, replacing);