aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflicts for a8709ddb to ub-launcher3-master

Browse Source 
Change-Id: I172395e6e172914627b6dec721070a66520557b1
This commit is contained in:
Tony Wickham
2015-10-15 11:18:26 -07:00
parent 9a9765924f a8709ddbbf
commit 9ccb94b6e4
5 changed files with 59 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/Workspace.java
View File

@@ -2064,6 +2064,7 @@ public class Workspace extends PagedView
@Override
public void onLauncherTransitionPrepare(Launcher l, boolean animated, boolean toWorkspace) {
mIsSwitchingState = true;
mTransitionProgress = 0;
// Invalidate here to ensure that the pages are rendered during the state change transition.
invalidate();
@@ -3574,11 +3575,6 @@ public class Workspace extends PagedView
Resources res = mLauncher.getResources();
final int duration = res.getInteger(R.integer.config_dropAnimMaxDuration) - 200;
// In the case where we've prebound the widget, we remove it from the DragLayer
if (finalView instanceof AppWidgetHostView && external) {
mLauncher.getDragLayer().removeView(finalView);
}
boolean isWidget = info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET ||
info.itemType == LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET;
if ((animationType == ANIMATE_INTO_POSITION_AND_RESIZE || external) && finalView != null) {