diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-06-28 23:50:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-28 23:50:26 +0000 |
| commit | 26def23702881867208bfc465af27a4f9afc26f6 (patch) | |
| tree | 36dfb902d585f44f4d7e289923be49401cbfcdd2 /src/com/android/launcher3/allapps/AllAppsTransitionController.java | |
| parent | 3ddb64efb5df3e1c6fda4bcd8d03c7f36217da9b (diff) | |
| parent | 67def6cef16bf67aac3a791662dda41c085e24a7 (diff) | |
| download | android_packages_apps_Trebuchet-26def23702881867208bfc465af27a4f9afc26f6.tar.gz android_packages_apps_Trebuchet-26def23702881867208bfc465af27a4f9afc26f6.tar.bz2 android_packages_apps_Trebuchet-26def23702881867208bfc465af27a4f9afc26f6.zip | |
Merge "All apps icons should become clickable" into ub-launcher3-calgary
Diffstat (limited to 'src/com/android/launcher3/allapps/AllAppsTransitionController.java')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 4e4e87cca..4c51dfe91 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -258,8 +258,6 @@ public class AllAppsTransitionController implements TouchController, VerticalPul mAppsView.getRevealView().setAlpha(mHotseatBackgroundAlpha); setProgress(mShiftRange); } else { - // TODO: get rid of this workaround to override state change by workspace transition - mWorkspace.onLauncherTransitionPrepare(mLauncher, false, false); View child = ((CellLayout) mWorkspace.getChildAt(mWorkspace.getNextPage())) .getShortcutsAndWidgets(); child.setVisibility(View.VISIBLE); @@ -429,9 +427,6 @@ public class AllAppsTransitionController implements TouchController, VerticalPul } public void finishPullDown() { - if (mHotseat.getBackground() != null) { - return; - } mAppsView.setVisibility(View.INVISIBLE); mHotseat.setBackgroundTransparent(false /* transparent */); mHotseat.setVisibility(View.VISIBLE); |