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

am c0b52fef: Refactoring to ensure item deletion always removes from the DB.

Browse Source 
* commit 'c0b52fefbc11531d560359c093484099f9d1298e':
  Refactoring to ensure item deletion always removes from the DB.
This commit is contained in:
Winson
2015-09-10 22:03:57 +00:00
committed by Android Git Automerger
parent d6a887b6a7 c0b52fefbc
commit 7089a4e197
6 changed files with 75 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,7 +186,8 @@ public class FocusHelper {
return consume;
}
DeviceProfile profile = ((Launcher) v.getContext()).getDeviceProfile();
final Launcher launcher = (Launcher) v.getContext();
final DeviceProfile profile = launcher.getDeviceProfile();
if (DEBUG) {
Log.v(TAG, String.format(
@@ -197,7 +198,6 @@ public class FocusHelper {
// Initialize the variables.
final ShortcutAndWidgetContainer hotseatParent = (ShortcutAndWidgetContainer) v.getParent();
final CellLayout hotseatLayout = (CellLayout) hotseatParent.getParent();
Hotseat hotseat = (Hotseat) hotseatLayout.getParent();
Workspace workspace = (Workspace) v.getRootView().findViewById(R.id.workspace);
int pageIndex = workspace.getNextPage();
@@ -241,7 +241,10 @@ public class FocusHelper {
} else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT &&
profile.isVerticalBarLayout()) {
keyCode = KeyEvent.KEYCODE_PAGE_DOWN;
}else {
} else if (keyCode == KeyEvent.KEYCODE_DEL || keyCode == KeyEvent.KEYCODE_FORWARD_DEL) {
ItemInfo info = (ItemInfo) v.getTag();
launcher.removeItem(v, info, true /* deleteFromDb */);
} else {
// For other KEYCODE_DPAD_LEFT and KEYCODE_DPAD_RIGHT navigation, do not use the
// matrix extended with hotseat.
matrix = FocusLogic.createSparseMatrix(hotseatLayout);
@@ -327,7 +330,8 @@ public class FocusHelper {
!hotseat.hasIcons() /* ignore all apps icon, unless there are no other icons */);
countX = countX + 1;
} else if (keyCode == KeyEvent.KEYCODE_DEL || keyCode == KeyEvent.KEYCODE_FORWARD_DEL) {
workspace.removeWorkspaceItem(v);
ItemInfo info = (ItemInfo) v.getTag();
launcher.removeItem(v, info, true /* deleteFromDb */);
return consume;
} else {
matrix = FocusLogic.createSparseMatrix(iconLayout);