Ensuring that we don't clobber workspace screens map when new apps are added.

- Using Log warnings instead of debugs
- Ensuring we don't save negative screen id's

Change-Id: I13276d007193c120ee0830abcdc6eb203f22a9da

1 files changed, 8 insertions, 8 deletions

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 07b27bed8..44eeae41e 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -518,7 +518,7 @@ public class Workspace extends SmoothPagedView
     }
 
     public long insertNewWorkspaceScreen(long screenId, int insertIndex, boolean updateDb) {
-        Log.d(TAG, "10249126 - insertNewWorkspaceScreen(" + screenId + ", " + insertIndex + ", " + updateDb + ")");
+        Log.w(TAG, "10249126 - insertNewWorkspaceScreen(" + screenId + ", " + insertIndex + ", " + updateDb + ")");
         CellLayout newScreen = (CellLayout)
                 mLauncher.getLayoutInflater().inflate(R.layout.workspace_screen, null);
 
@@ -535,7 +535,7 @@ public class Workspace extends SmoothPagedView
     }
 
     public void createCustomContentPage() {
-        Log.d(TAG, "10249126 - createCustomContentPage()");
+        Log.w(TAG, "10249126 - createCustomContentPage()");
         CellLayout customScreen = (CellLayout)
                 mLauncher.getLayoutInflater().inflate(R.layout.workspace_screen, null);
 
@@ -570,7 +570,7 @@ public class Workspace extends SmoothPagedView
     }
 
     public long commitExtraEmptyScreen() {
-        Log.d(TAG, "10249126 - commitExtraEmptyScreen()");
+        Log.w(TAG, "10249126 - commitExtraEmptyScreen()");
         CellLayout cl = mWorkspaceScreens.get(EXTRA_EMPTY_SCREEN_ID);
         mWorkspaceScreens.remove(EXTRA_EMPTY_SCREEN_ID);
         mScreenOrder.remove(EXTRA_EMPTY_SCREEN_ID);
@@ -592,13 +592,13 @@ public class Workspace extends SmoothPagedView
     }
 
     public CellLayout getScreenWithId(long screenId) {
-        Log.d(TAG, "10249126 - getScreenWithId(" + screenId + ")");
+        Log.w(TAG, "10249126 - getScreenWithId(" + screenId + ")");
         CellLayout layout = mWorkspaceScreens.get(screenId);
         return layout;
     }
 
     public long getIdForScreen(CellLayout layout) {
-        Log.d(TAG, "10249126 - getIdForScreen()");
+        Log.w(TAG, "10249126 - getIdForScreen()");
         Iterator<Long> iter = mWorkspaceScreens.keySet().iterator();
         while (iter.hasNext()) {
             long id = iter.next();
@@ -610,7 +610,7 @@ public class Workspace extends SmoothPagedView
     }
 
     public int getPageIndexForScreenId(long screenId) {
-        Log.d(TAG, "10249126 - getPageIndexForScreenId(" + screenId + ")");
+        Log.w(TAG, "10249126 - getPageIndexForScreenId(" + screenId + ")");
         return indexOfChild(mWorkspaceScreens.get(screenId));
     }
 
@@ -628,7 +628,7 @@ public class Workspace extends SmoothPagedView
             return;
         }
 
-        Log.d(TAG, "10249126 - stripEmptyScreens()");
+        Log.w(TAG, "10249126 - stripEmptyScreens()");
 
         int currentPage = getNextPage();
         ArrayList<Long> removeScreens = new ArrayList<Long>();
@@ -641,7 +641,7 @@ public class Workspace extends SmoothPagedView
 
         int pageShift = 0;
         for (Long id: removeScreens) {
-            Log.d(TAG, "10249126 - \tremove(" + id + ")");
+            Log.w(TAG, "10249126 - \tremove(" + id + ")");
             CellLayout cl = mWorkspaceScreens.get(id);
             mWorkspaceScreens.remove(id);
             mScreenOrder.remove(id);