Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 829f37f3 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Workaround for remove stuck (issue 11080792)" into jb-ub-now-jetsonic

parents e494aaf7 f72693d9

src/com/android/launcher3/SearchDropTargetBar.java

+4 −4
Original line number Diff line number Diff line
@@ -71,10 +71,10 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D 
        mDeleteDropTarget.setLauncher(launcher);

        mQSBSearchBar = launcher.getQsbBar();

        if (mEnableDropDownDropTargets) {

            mQSBSearchBarAnim = LauncherAnimUtils.ofFloat(mQSBSearchBar, "translationY", 0,

            mQSBSearchBarAnim = ObjectAnimator.ofFloat(mQSBSearchBar, "translationY", 0f,

                    -mBarHeight);

        } else {

            mQSBSearchBarAnim = LauncherAnimUtils.ofFloat(mQSBSearchBar, "alpha", 1f, 0f);

            mQSBSearchBarAnim = ObjectAnimator.ofFloat(mQSBSearchBar, "alpha", 1f, 0f);

        }

        setupAnimation(mQSBSearchBarAnim, mQSBSearchBar);

    }
@@ -117,12 +117,12 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D 
            DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();

            mBarHeight = grid.searchBarSpaceHeightPx;

            mDropTargetBar.setTranslationY(-mBarHeight);

            mDropTargetBarAnim = LauncherAnimUtils.ofFloat(mDropTargetBar, "translationY",

            mDropTargetBarAnim = ObjectAnimator.ofFloat(mDropTargetBar, "translationY",

                    -mBarHeight, 0f);



        } else {

            mDropTargetBar.setAlpha(0f);

            mDropTargetBarAnim = LauncherAnimUtils.ofFloat(mDropTargetBar, "alpha", 0f, 1f);

            mDropTargetBarAnim = ObjectAnimator.ofFloat(mDropTargetBar, "alpha", 0f, 1f);

        }

        setupAnimation(mDropTargetBarAnim, mDropTargetBar);

    }