diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-07-31 19:51:07 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-07-31 19:51:07 +0000 |
commit | 5e1658a1889811203c84d5ff835e38a161359db2 (patch) | |
tree | 330942a1a052fd3d090943adb64b161bc9d9eab1 /src/com/android | |
parent | f462b251e13791945f3939e2ebde5a71c99daac3 (diff) | |
parent | 9eb96c5811fb0c9ccc67f3dd740405d4dc61a88a (diff) | |
download | android_packages_apps_Trebuchet-5e1658a1889811203c84d5ff835e38a161359db2.tar.gz android_packages_apps_Trebuchet-5e1658a1889811203c84d5ff835e38a161359db2.tar.bz2 android_packages_apps_Trebuchet-5e1658a1889811203c84d5ff835e38a161359db2.zip |
Merge "Fixing multi-window DnD getting cancelled when starting a new activity in the middle" into ub-launcher3-qt-r1-dev
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher3/dragndrop/AddItemActivity.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java index a72089d7c..a2dcbf87d 100644 --- a/src/com/android/launcher3/dragndrop/AddItemActivity.java +++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java @@ -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; } |