Fixing some comments (857bfcf3) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/PinchAnimationManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -149,11 +149,11 @@ public class PinchAnimationManager {
		if (startState == OVERVIEW) {
		animateOverviewPanelButtons(goingTowards == OVERVIEW);
		} else if (startState == NORMAL) {
		animateHotseatAndPageIndicator(goingTowards == NORMAL);
		animateHotseatAndQsb(goingTowards == NORMAL);
		}
		} else if (threshold == PinchThresholdManager.THRESHOLD_TWO) {
		if (startState == OVERVIEW) {
		animateHotseatAndPageIndicator(goingTowards == NORMAL);
		animateHotseatAndQsb(goingTowards == NORMAL);
		animateScrim(goingTowards == OVERVIEW);
		} else if (startState == NORMAL) {
		animateOverviewPanelButtons(goingTowards == OVERVIEW);
		@@ -188,7 +188,7 @@ public class PinchAnimationManager {
		}
		}

		private void animateHotseatAndPageIndicator(boolean show) {
		private void animateHotseatAndQsb(boolean show) {
		startAnimator(INDEX_HOTSEAT,
		mWorkspace.createHotseatAlphaAnimator(show ? 1 : 0), THRESHOLD_ANIM_DURATION);
		startAnimator(INDEX_QSB, mWorkspace.mQsbAlphaController.animateAlphaAtIndex(

+5 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 The Android Open Source Project
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -53,6 +53,10 @@ public class MultiStateAlphaController {
		: (mAm.isEnabled() ? View.GONE : View.INVISIBLE));
		}

		/**
		* Returns an animator which changes the alpha at the index {@param index}
		* to {@param finalAlpha}. Alphas at other index are not affected.
		*/
		public Animator animateAlphaAtIndex(float finalAlpha, final int index) {
		if (Float.compare(finalAlpha, mAlphas[index]) == 0) {
		// Return a dummy animator to avoid null checks.