Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20f56a7c authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-merger
Browse files

Merge "Fixing multi-window DnD getting cancelled when starting a new activity... 

Merge "Fixing multi-window DnD getting cancelled when starting a new activity in the middle" into ub-launcher3-qt-r1-dev
am: 5e1658a1

Change-Id: I849c337f45395692dc547ee2e9c82f61ff1b4efa
parents c86a6ebb 5e1658a1

src/com/android/launcher3/dragndrop/AddItemActivity.java

+12 −10
Original line number Diff line number Diff line
@@ -153,16 +153,6 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener 
        PinItemDragListener listener = new PinItemDragListener(mRequest, bounds,

                img.getBitmap().getWidth(), img.getWidth());



        Intent homeIntent = listener.addToIntent(

                new Intent(Intent.ACTION_MAIN)

                        .addCategory(Intent.CATEGORY_HOME)

                        .setPackage(getPackageName())

                        .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));



        listener.initWhenReady();

        startActivity(homeIntent,

                ActivityOptions.makeCustomAnimation(this, 0, android.R.anim.fade_out).toBundle());

        mFinishOnPause = true;



        // Start a system drag and drop. We use a transparent bitmap as preview for system drag

        // as the preview is handled internally by launcher.
@@ -179,6 +169,18 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener 
                outShadowTouchPoint.set(SHADOW_SIZE / 2, SHADOW_SIZE / 2);

            }

        }, null, View.DRAG_FLAG_GLOBAL);





        Intent homeIntent = listener.addToIntent(

                new Intent(Intent.ACTION_MAIN)

                        .addCategory(Intent.CATEGORY_HOME)

                        .setPackage(getPackageName())

                        .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));



        listener.initWhenReady();

        startActivity(homeIntent,

                ActivityOptions.makeCustomAnimation(this, 0, android.R.anim.fade_out).toBundle());

        mFinishOnPause = true;

        return false;

    }