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

Fixing talk-back folder icon removal regression.

Browse Source 
Change-Id: I0b7fff645828d5198500973f1c9ea74f406a1a43
This commit is contained in:
Winson
2015-09-24 09:56:11 -07:00
committed by Sunny Goyal
parent 122a753dab
commit 2949fb5b16
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/launcher3/DeleteDropTarget.java
View File

@@ -73,7 +73,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
// Remove the item from launcher and the db, we can ignore the containerInfo in this call
// because we already remove the drag view from the folder (if the drag originated from
// a folder) in Folder.beginDrag()
launcher.removeItem(view, null, item, true /* deleteFromDb */);
launcher.removeItem(view, item, true /* deleteFromDb */);
launcher.getWorkspace().stripEmptyScreens();
return true;
}

4
src/com/android/launcher3/FocusHelper.java
View File

@@ -247,7 +247,7 @@ public class FocusHelper {
}
} else if (isDeleteKeyChord(e)) {
matrix = FocusLogic.createSparseMatrix(iconLayout);
launcher.removeItem(v, null, itemInfo, true /* deleteFromDb */);
launcher.removeItem(v, itemInfo, true /* deleteFromDb */);
} else {
// For other KEYCODE_DPAD_LEFT and KEYCODE_DPAD_RIGHT navigation, do not use the
// matrix extended with hotseat.
@@ -341,7 +341,7 @@ public class FocusHelper {
}
} else if (isDeleteKeyChord(e)) {
matrix = FocusLogic.createSparseMatrix(iconLayout);
launcher.removeItem(v, null, itemInfo, true /* deleteFromDb */);
launcher.removeItem(v, itemInfo, true /* deleteFromDb */);
} else {
matrix = FocusLogic.createSparseMatrix(iconLayout);
}

2
src/com/android/launcher3/Folder.java
View File

@@ -1115,7 +1115,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
// Remove the folder
if (getItemCount() <= 1) {
mLauncher.removeItem(mFolderIcon, null, mInfo, true /* deleteFromDb */);
mLauncher.removeItem(mFolderIcon, mInfo, true /* deleteFromDb */);
if (mFolderIcon instanceof DropTarget) {
mDragController.removeDropTarget((DropTarget) mFolderIcon);
}

9
src/com/android/launcher3/Launcher.java
View File

@@ -2419,16 +2419,15 @@ public class Launcher extends Activity
* Unbinds the view for the specified item, and removes the item and all its children.
*
* @param v the view being removed.
* @param containerInfo the {@link FolderInfo} container of this view (can be null).
* @param itemInfo the {@link ItemInfo} for this view.
* @param deleteFromDb whether or not to delete this item from the db.
*/
public boolean removeItem(View v, FolderInfo containerInfo, ItemInfo itemInfo,
boolean deleteFromDb) {
public boolean removeItem(View v, ItemInfo itemInfo, boolean deleteFromDb) {
if (itemInfo instanceof ShortcutInfo) {
// Remove the shortcut from the folder before removing it from launcher
if (containerInfo != null) {
containerInfo.remove((ShortcutInfo) itemInfo);
FolderInfo folderInfo = sFolders.get(itemInfo.container);
if (folderInfo != null) {
folderInfo.remove((ShortcutInfo) itemInfo);
} else {
mWorkspace.removeWorkspaceItem(v);
}

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

@@ -1120,7 +1120,7 @@ public class Workspace extends PagedView
if (lahv != null && lahv.isReinflateRequired()) {
// Remove and rebind the current widget (which was inflated in the wrong
// orientation), but don't delete it from the database
mLauncher.removeItem(lahv, null, info, false /* deleteFromDb */);
mLauncher.removeItem(lahv, info, false /* deleteFromDb */);
mLauncher.bindAppWidget(info);
}
}
@@ -4525,7 +4525,7 @@ public class Workspace extends PagedView
if (info.hostView instanceof PendingAppWidgetHostView) {
// Remove and rebind the current widget, but don't delete it from the database
PendingAppWidgetHostView view = (PendingAppWidgetHostView) info.hostView;
mLauncher.removeItem(view, null, info, false /* deleteFromDb */);
mLauncher.removeItem(view, info, false /* deleteFromDb */);
mLauncher.bindAppWidget(info);
}
}