summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Launcher.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-06-06 15:56:08 -0700
committerWinson Chung <winsonc@google.com>2012-06-06 15:57:27 -0700
commitbfeac0681b63091731c853fdafa3206642449a9d (patch)
tree849fcfccc0cdf250a82a8e387a47294d61174ae4 /src/com/android/launcher2/Launcher.java
parente6d3361ee85bf88f1f55970d7d80a20b31ea9ea7 (diff)
downloadandroid_packages_apps_Trebuchet-bfeac0681b63091731c853fdafa3206642449a9d.tar.gz
android_packages_apps_Trebuchet-bfeac0681b63091731c853fdafa3206642449a9d.tar.bz2
android_packages_apps_Trebuchet-bfeac0681b63091731c853fdafa3206642449a9d.zip
Synchronizing on the new-apps list before modifying it. (Bug 6621553)
- Minor tweak to qsb padding - Adding yet more logging for single-app-page issue Change-Id: I4272dd7a70c9ac26f026b03a1f991f14844fdb9d
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r--src/com/android/launcher2/Launcher.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 9cae5e596..bbee7879f 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -3165,9 +3165,13 @@ public final class Launcher extends Activity
View shortcut = createShortcut(info);
workspace.addInScreen(shortcut, item.container, item.screen, item.cellX,
item.cellY, 1, 1, false);
- if (newApps.contains(uri)) {
- newApps.remove(uri);
-
+ boolean animateIconUp = false;
+ synchronized (newApps) {
+ if (newApps.contains(uri)) {
+ animateIconUp = newApps.remove(uri);
+ }
+ }
+ if (animateIconUp) {
// Prepare the view to be animated up
shortcut.setAlpha(0f);
shortcut.setScaleX(0f);