diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-03-30 23:32:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-30 23:32:57 +0000 |
| commit | 4a907d0f9d1c80661c086aa95a8509698f38b324 (patch) | |
| tree | 6de314a18758746f77b74fab891c32f593546b38 /src/com/android/launcher3/dragndrop | |
| parent | d73fbb5f975ceedaec6463164ee39b3f32623151 (diff) | |
| parent | 8a39b42cc84ee8e1e17861692e0e562c714f3d72 (diff) | |
| download | android_packages_apps_Trebuchet-4a907d0f9d1c80661c086aa95a8509698f38b324.tar.gz android_packages_apps_Trebuchet-4a907d0f9d1c80661c086aa95a8509698f38b324.tar.bz2 android_packages_apps_Trebuchet-4a907d0f9d1c80661c086aa95a8509698f38b324.zip | |
Merge "Delay the PinItemRequest#accept() call until the drop animation is finished." into ub-launcher3-dorval
Diffstat (limited to 'src/com/android/launcher3/dragndrop')
| -rw-r--r-- | src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java b/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java index 26460d776..bb5ac5b02 100644 --- a/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java +++ b/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java @@ -26,8 +26,10 @@ import android.graphics.drawable.Drawable; import android.os.Build; import com.android.launcher3.IconCache; +import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherSettings; +import com.android.launcher3.R; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.PinItemRequestCompat; import com.android.launcher3.compat.ShortcutConfigActivityInfo; @@ -73,7 +75,13 @@ class PinShortcutRequestActivityInfo extends ShortcutConfigActivityInfo { @Override public com.android.launcher3.ShortcutInfo createShortcutInfo() { - return LauncherAppsCompat.createShortcutInfoFromPinItemRequest(mContext, mRequest); + // Total duration for the drop animation to complete. + long duration = mContext.getResources().getInteger(R.integer.config_dropAnimMaxDuration) + + Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT + + mContext.getResources().getInteger(R.integer.config_overlayTransitionTime) / 2; + // Delay the actual accept() call until the drop animation is complete. + return LauncherAppsCompat.createShortcutInfoFromPinItemRequest( + mContext, mRequest, duration); } @Override |