Merge "Cancel fullscreen countdown timer on interaction." into oc-mr1-dev (f7ff0c87) · Commits · e / os / android_frameworks_base

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 */);
		}
		}