aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 09:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "When ensuring screen exists, make sure it's actually referring to a screen, not a rank" into ub-now-porkchop

Browse Source
This commit is contained in:
Adam Cohen
2014-09-20 06:45:53 +00:00
committed by Android (Google) Code Review
parent 68207e2532 83079e43ae
commit d8f6253e67
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -721,8 +721,13 @@ public class Launcher extends Activity
* a configuration step, this allows the proper animations to run after other transitions.
*/
private long completeAdd(PendingAddArguments args) {
long screenId = args.screenId;
if (args.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {
// When the screen id represents an actual screen (as opposed to a rank) we make sure
// that the drop page actually exists.
screenId = ensurePendingDropLayoutExists(args.screenId);
}
long screenId = ensurePendingDropLayoutExists(args.screenId);
switch (args.requestCode) {
case REQUEST_CREATE_SHORTCUT:
completeAddShortcut(args.intent, args.container, screenId, args.cellX,
@@ -814,7 +819,12 @@ public class Launcher extends Activity
}
} else {
if (!workspaceLocked) {
mPendingAddInfo.screenId = ensurePendingDropLayoutExists(mPendingAddInfo.screenId);
if (mPendingAddInfo.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {
// When the screen id represents an actual screen (as opposed to a rank)
// we make sure that the drop page actually exists.
mPendingAddInfo.screenId =
ensurePendingDropLayoutExists(mPendingAddInfo.screenId);
}
final CellLayout dropLayout = mWorkspace.getScreenWithId(mPendingAddInfo.screenId);
dropLayout.setDropPending(true);