diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-27 07:23:13 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-27 07:23:13 +0000 |
commit | df0843e569b93e77355990f7a71fe39746b43493 (patch) | |
tree | b5fb050ecef07e3f2020513a526f6a99f46554c4 /src/com/android/launcher3/dragndrop | |
parent | 4ac63b28ced5d5b09eaae39adca68377a2a7ef5b (diff) | |
parent | aea65680e6f3da83636dbc6af2ef1381de06d2a8 (diff) | |
download | android_packages_apps_Trebuchet-df0843e569b93e77355990f7a71fe39746b43493.tar.gz android_packages_apps_Trebuchet-df0843e569b93e77355990f7a71fe39746b43493.tar.bz2 android_packages_apps_Trebuchet-df0843e569b93e77355990f7a71fe39746b43493.zip |
Snap for 4807121 from aea65680e6f3da83636dbc6af2ef1381de06d2a8 to pi-release
Change-Id: Id61934dcc353f297ad35ca1fbd7ffe385a2503a3
Diffstat (limited to 'src/com/android/launcher3/dragndrop')
-rw-r--r-- | src/com/android/launcher3/dragndrop/DragController.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/dragndrop/DragView.java | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java index 5c6946c47..8a216fc17 100644 --- a/src/com/android/launcher3/dragndrop/DragController.java +++ b/src/com/android/launcher3/dragndrop/DragController.java @@ -138,7 +138,7 @@ public class DragController implements DragDriver.EventListener, TouchController */ public DragView startDrag(Bitmap b, int dragLayerX, int dragLayerY, DragSource source, ItemInfo dragInfo, Point dragOffset, Rect dragRegion, - float initialDragViewScale, DragOptions options) { + float initialDragViewScale, float dragViewScaleOnDrop, DragOptions options) { if (PROFILE_DRAWING_DURING_DRAG) { android.os.Debug.startMethodTracing("Launcher"); } @@ -169,7 +169,7 @@ public class DragController implements DragDriver.EventListener, TouchController final float scaleDps = mIsInPreDrag ? res.getDimensionPixelSize(R.dimen.pre_drag_view_scale) : 0f; final DragView dragView = mDragObject.dragView = new DragView(mLauncher, b, registrationX, - registrationY, initialDragViewScale, scaleDps); + registrationY, initialDragViewScale, dragViewScaleOnDrop, scaleDps); dragView.setItemInfo(dragInfo); mDragObject.dragComplete = false; if (mOptions.isAccessibleDrag) { diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 53e9e2dac..6d2d3cb44 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -218,7 +218,8 @@ public class DragLayer extends BaseDragLayer<Launcher> { @Override public void addChildrenForAccessibility(ArrayList<View> childrenForAccessibility) { - View topView = AbstractFloatingView.getTopOpenView(mActivity); + View topView = AbstractFloatingView.getTopOpenViewWithType(mActivity, + AbstractFloatingView.TYPE_ACCESSIBLE); if (topView != null) { addAccessibleChildToList(topView, childrenForAccessibility); if (isInAccessibleDrag()) { diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java index 1e5f8545b..551567ae7 100644 --- a/src/com/android/launcher3/dragndrop/DragView.java +++ b/src/com/android/launcher3/dragndrop/DragView.java @@ -89,6 +89,7 @@ public class DragView extends View { private final int mRegistrationX; private final int mRegistrationY; private final float mInitialScale; + private final float mScaleOnDrop; private final int[] mTempLoc = new int[2]; private Point mDragVisualizeOffset = null; @@ -131,7 +132,7 @@ public class DragView extends View { * @param registrationY The y coordinate of the registration point. */ public DragView(Launcher launcher, Bitmap bitmap, int registrationX, int registrationY, - final float initialScale, final float finalScaleDps) { + final float initialScale, final float scaleOnDrop, final float finalScaleDps) { super(launcher); mLauncher = launcher; mDragLayer = launcher.getDragLayer(); @@ -180,6 +181,7 @@ public class DragView extends View { mRegistrationY = registrationY; mInitialScale = initialScale; + mScaleOnDrop = scaleOnDrop; // Force a measure, because Workspace uses getMeasuredHeight() before the layout pass int ms = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED); @@ -596,7 +598,7 @@ public class DragView extends View { public void animateTo(int toTouchX, int toTouchY, Runnable onCompleteRunnable, int duration) { mTempLoc[0] = toTouchX - mRegistrationX; mTempLoc[1] = toTouchY - mRegistrationY; - mDragLayer.animateViewIntoPosition(this, mTempLoc, 1f, mInitialScale, mInitialScale, + mDragLayer.animateViewIntoPosition(this, mTempLoc, 1f, mScaleOnDrop, mScaleOnDrop, DragLayer.ANIMATION_END_DISAPPEAR, onCompleteRunnable, duration); } |