diff options
author | Rajeev Kumar <rajekumar@google.com> | 2017-06-15 18:18:17 -0700 |
---|---|---|
committer | Rajeev Kumar <rajekumar@google.com> | 2017-06-16 13:20:58 -0700 |
commit | 11c7bc678b5dc37749c84e7aa00d6d00f4fc1b02 (patch) | |
tree | 1ff2990f335d4a18a282fab224cae3f4dece2ad2 /src/com/android/launcher3/Workspace.java | |
parent | 5692eb4554085c487aeb200c50a9bdeccf0a13e8 (diff) | |
download | android_packages_apps_Trebuchet-11c7bc678b5dc37749c84e7aa00d6d00f4fc1b02.tar.gz android_packages_apps_Trebuchet-11c7bc678b5dc37749c84e7aa00d6d00f4fc1b02.tar.bz2 android_packages_apps_Trebuchet-11c7bc678b5dc37749c84e7aa00d6d00f4fc1b02.zip |
1. Avoid object allocations during draw/layout operations (preallocate
and reuse instead).
2. Prevent NPE in dereferencing mDragInfo.
3. Get rid of unused variable assignments.
Change-Id: Ie74169795462d4dbdb61f84495ed1ec6ab2b0709
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 3fe78757b..b955fe1b5 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -305,8 +305,6 @@ public class Workspace extends PagedView private boolean mForceDrawAdjacentPages = false; // Total over scrollX in the overlay direction. private float mOverlayTranslation; - private int mFirstPageScrollX; - private boolean mIgnoreQsbScroll; // Handles workspace state transitions private final WorkspaceStateTransitionAnimation mStateTransitionAnimation; @@ -1739,32 +1737,6 @@ public class Workspace extends PagedView mWallpaperOffset.jumpToFinal(); } super.onLayout(changed, left, top, right, bottom); - mFirstPageScrollX = getScrollForPage(0); - - final LayoutTransition transition = getLayoutTransition(); - // If the transition is running defer updating max scroll, as some empty pages could - // still be present, and a max scroll change could cause sudden jumps in scroll. - if (transition != null && transition.isRunning()) { - transition.addTransitionListener(new LayoutTransition.TransitionListener() { - - @Override - public void startTransition(LayoutTransition transition, ViewGroup container, - View view, int transitionType) { - mIgnoreQsbScroll = true; - } - - @Override - public void endTransition(LayoutTransition transition, ViewGroup container, - View view, int transitionType) { - // Wait until all transitions are complete. - if (!transition.isRunning()) { - mIgnoreQsbScroll = false; - transition.removeTransitionListener(this); - mFirstPageScrollX = getScrollForPage(0); - } - } - }); - } updatePageAlphaValues(); } @@ -3548,7 +3520,7 @@ public class Workspace extends PagedView } } if ((d.cancelled || (beingCalledAfterUninstall && !mUninstallSuccessful)) - && mDragInfo.cell != null) { + && mDragInfo != null && mDragInfo.cell != null) { mDragInfo.cell.setVisibility(VISIBLE); } mDragInfo = null; @@ -4121,8 +4093,8 @@ public class Workspace extends PagedView private boolean mRefreshPending; - public DeferredWidgetRefresh(ArrayList<LauncherAppWidgetInfo> infos, - LauncherAppWidgetHost host) { + DeferredWidgetRefresh(ArrayList<LauncherAppWidgetInfo> infos, + LauncherAppWidgetHost host) { mInfos = infos; mHost = host; mHandler = new Handler(); |