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

Commit b337acb6 authored by Saalim Quadri's avatar Saalim Quadri Committed by Mohammed Althaf T
Browse files

(fix) Update workspace item hide logic 



* Previously, launcher.getHotseat does not seem to work
  in all scenarios, so let's use workspace.getHotseat()

* Apart from this, duration for hotseat does not seem to
  work when set to 0, so set it to 50 as default, and 0
  specific to pageIndicator.

Signed-off-by: default avatarSaalim Quadri <danascape@gmail.com>
parent ad20354c

bliss/src/foundation/e/bliss/folder/GridFolder.java

+18 −5
Original line number Diff line number Diff line
@@ -258,6 +258,10 @@ public class GridFolder extends Folder implements OnAlarmListener { 
    }



    private void showOrHideDesktop(Launcher launcher, boolean hide) {

        showOrHideDesktop(launcher, hide, 50);

    }



    private void showOrHideDesktop(Launcher launcher, boolean hide, long duration) {

        if (isAnimating)

            return;
@@ -266,8 +270,14 @@ public class GridFolder extends Folder implements OnAlarmListener { 
        Workspace<?> workspace = launcher.getWorkspace();

        if (workspace != null) {

            play(set, getAnimator(workspace, 1f, 0f, hide));

            if (workspace.getPageAt(workspace.getCurrentPage()) != null) {

                play(set, getAnimator(workspace.getPageAt(workspace.getCurrentPage()), 1f, 0f, hide));

            }

            if (workspace.getHotseat() != null) {

                play(set, getAnimator(workspace.getHotseat(), 1f, 0f, hide));

            }

            if (workspace.getPageIndicator() != null) {

                play(set, getAnimator(workspace.getPageIndicator(), 1f, 0f, hide));

                play(set, getAnimator(workspace.getPageIndicator(), 1f, 0f, hide), 0);

                if (!hide && launcher.isInState(LauncherState.SPRING_LOADED)) {

                    workspace.showPageIndicatorAtCurrentScroll();

                }
@@ -281,17 +291,16 @@ public class GridFolder extends Folder implements OnAlarmListener { 
            if (qsb != null) {

                play(set, getAnimator(qsb, 1f, 0f, hide));

            }



        }



        ScrimView scrimView = launcher.findViewById(R.id.scrim_view);

        if (scrimView != null) {

            play(set, getAnimator(scrimView, 1f, 0f, hide));

            play(set, getAnimator(scrimView, 1f, 0f, hide), duration);

        }



        BlurBackgroundView blur = launcher.mBlurLayer;

        if (blur != null) {

            play(set, getAnimator(blur, 0f, 1f, hide));

            play(set, getAnimator(blur, 0f, 1f, hide), duration);

        }

        set.addListener(new AnimatorListenerAdapter() {

            @Override
@@ -391,8 +400,12 @@ public class GridFolder extends Folder implements OnAlarmListener { 
    }



    private void play(AnimatorSet as, Animator a) {

        play(as, a, 50);

    }



    private void play(AnimatorSet as, Animator a, long duration) {

        a.setStartDelay(a.getStartDelay());

        a.setDuration(0);

        a.setDuration(duration);

        as.play(a);

    }

}