Merge changes I559fae32,Ic4db1a3a into jb-ub-gel-agar
* changes:
More logging.
Adding additional logging.
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index b085441..9ec6c35 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1434,6 +1434,7 @@
// 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 @@
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 @@
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 @@
}
// 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 7e6b832..c982b3d 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -636,6 +636,7 @@
int pageShift = 0;
for (Long id: removeScreens) {
+ Log.d(TAG, "10249126 - \tremove(" + id + ")");
CellLayout cl = mWorkspaceScreens.get(id);
mWorkspaceScreens.remove(id);
mScreenOrder.remove(id);