summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/LauncherModel.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-09-13 11:14:45 -0700
committerWinson Chung <winsonc@google.com>2013-09-13 11:40:05 -0700
commit11a1a53651924b544513f1f6971a735b18d67539 (patch)
treeb949b9438dd1b47c01e56574d2dc13fbd9cad7a1 /src/com/android/launcher3/LauncherModel.java
parentc639f8cdab11c603e25b5ae38282dddcb939d401 (diff)
downloadandroid_packages_apps_Trebuchet-11a1a53651924b544513f1f6971a735b18d67539.tar.gz
android_packages_apps_Trebuchet-11a1a53651924b544513f1f6971a735b18d67539.tar.bz2
android_packages_apps_Trebuchet-11a1a53651924b544513f1f6971a735b18d67539.zip
Fixing issue with folders not showing up.
- Add long click on empty spaces in hotseat to show overview mode - Limit the height of all apps to the workspace + hotseat size - Fixing some comments Change-Id: Ie5a97a8b04e449385e2b3f6230079aebf8e15d5a
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
-rw-r--r--src/com/android/launcher3/LauncherModel.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 18e1c85ba..179c8aa76 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2428,9 +2428,6 @@ public class LauncherModel extends BroadcastReceiver {
private void loadAllApps() {
final long loadTime = DEBUG_LOADERS ? SystemClock.uptimeMillis() : 0;
- // "two variables"?
- // Don't use these two variables in any of the callback runnables.
- // Otherwise we hold a reference to them.
final Callbacks oldCallbacks = mCallbacks.get();
if (oldCallbacks == null) {
// This launcher has exited and nobody bothered to tell us. Just bail.
@@ -2477,7 +2474,6 @@ public class LauncherModel extends BroadcastReceiver {
}
// Huh? Shouldn't this be inside the Runnable below?
- final Callbacks callbacks = tryGetCallbacks(oldCallbacks);
final ArrayList<AppInfo> added = mBgAllAppsList.added;
mBgAllAppsList.added = new ArrayList<AppInfo>();
@@ -2485,6 +2481,7 @@ public class LauncherModel extends BroadcastReceiver {
mHandler.post(new Runnable() {
public void run() {
final long bindTime = SystemClock.uptimeMillis();
+ final Callbacks callbacks = tryGetCallbacks(oldCallbacks);
if (callbacks != null) {
callbacks.bindAllApplications(added);
if (DEBUG_LOADERS) {