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

Commit 0a1791b9 authored by Bryan Eyler's avatar Bryan Eyler
Browse files

Cancel fullscreen countdown timer on interaction. 

Any interaction on the fullscreen user switcher should cancel the
countdown timer and cause it to go away.

Tested on Mojave
Bug 36454400

Change-Id: I22556988d38d140e773cbc7eff03a30bde4f1f46
(cherry picked from commit 87f57509)
parent 37f2e486

packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java

+10 −0
Original line number Diff line number Diff line
@@ -74,6 +74,15 @@ public class FullscreenUserSwitcher { 
            automaticallySelectUser();

        });



        // Any interaction with the screen should cancel the timer.

        mContainer.setOnClickListener(v -> {

            cancelTimer();

        });

        mUserGridView.setOnTouchListener((v, e) -> {

            cancelTimer();

            return false;

        });



        mSwitchingUsers = mParent.findViewById(R.id.switching_users);

    }
@@ -152,6 +161,7 @@ public class FullscreenUserSwitcher { 
        if (mTimer != null) {

            mTimer.cancel();

            mTimer = null;

            mProgressBar.setProgress(0, true /* animate */);

        }

    }