aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Change-Id: I13276d007193c120ee0830abcdc6eb203f22a9da
This commit is contained in:
Winson Chung
2013-08-19 15:43:29 -07:00
parent 430b79fd0e
commit 76828c87dd
3 changed files with 75 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/launcher3/Workspace.java
View File

@@ -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);