diff options
| author | Winson Chung <winsonc@google.com> | 2013-08-13 17:57:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-13 17:57:15 +0000 |
| commit | cda092178215afea108bc299181e343adf0a6627 (patch) | |
| tree | 9da889ae77f6df85c2b87241436298e2ac314b4c /src | |
| parent | e6661950f54f1813aec69928cecb3e5d4446c7e7 (diff) | |
| parent | e34930346b5eb468ad001d3b44698c11ef50e13a (diff) | |
| download | android_packages_apps_Trebuchet-cda092178215afea108bc299181e343adf0a6627.tar.gz android_packages_apps_Trebuchet-cda092178215afea108bc299181e343adf0a6627.tar.bz2 android_packages_apps_Trebuchet-cda092178215afea108bc299181e343adf0a6627.zip | |
Merge changes I559fae32,Ic4db1a3a into jb-ub-gel-agar
* changes:
More logging.
Adding additional logging.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 7 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index b08544133..9ec6c3562 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1434,6 +1434,7 @@ public class LauncherModel extends BroadcastReceiver { // Ensure that all the applications that are in the system are represented on the home // screen. + Log.d(TAG, "10249126 - verifyApplications(" + isUpgrade + ")"); if (!isUpgrade) { verifyApplications(); } @@ -1497,6 +1498,7 @@ public class LauncherModel extends BroadcastReceiver { synchronized (sBgLock) { for (ApplicationInfo app : mBgAllAppsList.data) { tmpInfos = getItemInfoForComponentName(app.componentName); + Log.d(TAG, "10249126 - \t" + app.componentName.getPackageName() + ", " + tmpInfos.isEmpty()); if (tmpInfos.isEmpty()) { // We are missing an application icon, so add this to the workspace added.add(app); @@ -1867,9 +1869,11 @@ public class LauncherModel extends BroadcastReceiver { long screenId = sc.getLong(idIndex); int rank = sc.getInt(rankIndex); + Log.d(TAG, "10249126 - loadWorkspace-!loadedOldDb(" + screenId + ", " + rank + ")"); + orderedScreens.put(rank, screenId); } catch (Exception e) { - Log.w(TAG, "Desktop items loading interrupted:", e); + Log.w(TAG, "Desktop items loading interrupted - invalid screens: ", e); } } } finally { @@ -1882,7 +1886,6 @@ public class LauncherModel extends BroadcastReceiver { } // Remove any empty screens - Log.d(TAG, "10249126 - loadWorkspace-!loadedOldDb()"); ArrayList<Long> unusedScreens = new ArrayList<Long>(); unusedScreens.addAll(sBgWorkspaceScreens); diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 7e6b8325e..c982b3dc2 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -636,6 +636,7 @@ public class Workspace extends SmoothPagedView int pageShift = 0; for (Long id: removeScreens) { + Log.d(TAG, "10249126 - \tremove(" + id + ")"); CellLayout cl = mWorkspaceScreens.get(id); mWorkspaceScreens.remove(id); mScreenOrder.remove(id); |