Merge "Fade out the taskbar icons when animating to overview in 3 button nav." into tm-qpr-dev (f6003ff0) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java

+6 −11

Original line number	Diff line number	Diff line
		@@ -785,17 +785,12 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
		public void dumpLogs(String prefix, PrintWriter pw) {
		pw.println(prefix + "NavbarButtonsViewController:");

		pw.println(String.format("%s\tmState=%s", prefix, getStateString(mState)));
		pw.println(String.format(
		"%s\tmLightIconColor=0x%s", prefix, Integer.toHexString(mLightIconColor)));
		pw.println(String.format(
		"%s\tmDarkIconColor=0x%s", prefix, Integer.toHexString(mDarkIconColor)));
		pw.println(String.format(
		"%s\tmFloatingRotationButtonBounds=%s", prefix, mFloatingRotationButtonBounds));
		pw.println(String.format(
		"%s\tmSysuiStateFlags=%s",
		prefix,
		QuickStepContract.getSystemUiStateString(mSysuiStateFlags)));
		pw.println(prefix + "\tmState=" + getStateString(mState));
		pw.println(prefix + "\tmLightIconColor=" + Integer.toHexString(mLightIconColor));
		pw.println(prefix + "\tmDarkIconColor=" + Integer.toHexString(mDarkIconColor));
		pw.println(prefix + "\tmFloatingRotationButtonBounds=" + mFloatingRotationButtonBounds);
		pw.println(prefix + "\tmSysuiStateFlags=" + QuickStepContract.getSystemUiStateString(
		mSysuiStateFlags));
		}

		private static String getStateString(int flags) {

+3 −4

Original line number	Diff line number	Diff line
		@@ -209,10 +209,9 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT
		public void dumpLogs(String prefix, PrintWriter pw) {
		pw.println(prefix + "StashedHandleViewController:");

		pw.println(String.format(
		"%s\tisStashedHandleVisible=%b", prefix, isStashedHandleVisible()));
		pw.println(String.format("%s\tmStashedHandleWidth=%dpx", prefix, mStashedHandleWidth));
		pw.println(String.format("%s\tmStashedHandleHeight=%dpx", prefix, mStashedHandleHeight));
		pw.println(prefix + "\tisStashedHandleVisible=" + isStashedHandleVisible());
		pw.println(prefix + "\tmStashedHandleWidth=" + mStashedHandleWidth);
		pw.println(prefix + "\tmStashedHandleHeight=" + mStashedHandleHeight);
		mRegionSamplingHelper.dump(prefix, pw);
		}
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -71,8 +71,7 @@ public class TaskbarAutohideSuspendController implements
		public void dumpLogs(String prefix, PrintWriter pw) {
		pw.println(prefix + "TaskbarAutohideSuspendController:");

		pw.println(String.format(
		"%s\tmAutohideSuspendFlags=%s", prefix, getStateString(mAutohideSuspendFlags)));
		pw.println(prefix + "\tmAutohideSuspendFlags=" + getStateString(mAutohideSuspendFlags));
		}

		private static String getStateString(int flags) {

+6 −8

Original line number	Diff line number	Diff line
		@@ -559,13 +559,11 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im
		public void dumpLogs(String prefix, PrintWriter pw) {
		pw.println(prefix + "TaskbarDragController:");

		pw.println(String.format("%s\tmDragIconSize=%dpx", prefix, mDragIconSize));
		pw.println(String.format("%s\tmTempXY=%s", prefix, Arrays.toString(mTempXY)));
		pw.println(String.format("%s\tmRegistrationX=%d", prefix, mRegistrationX));
		pw.println(String.format("%s\tmRegistrationY=%d", prefix, mRegistrationY));
		pw.println(String.format(
		"%s\tmIsSystemDragInProgress=%b", prefix, mIsSystemDragInProgress));
		pw.println(String.format(
		"%s\tisInternalDragInProgess=%b", prefix, super.isDragging()));
		pw.println(prefix + "\tmDragIconSize=" + mDragIconSize);
		pw.println(prefix + "\tmTempXY=" + Arrays.toString(mTempXY));
		pw.println(prefix + "\tmRegistrationX=" + mRegistrationX);
		pw.println(prefix + "\tmRegistrationY=" + mRegistrationY);
		pw.println(prefix + "\tmIsSystemDragInProgress=" + mIsSystemDragInProgress);
		pw.println(prefix + "\tisInternalDragInProgess=" + super.isDragging());
		}
		}

+3 −4

Original line number	Diff line number	Diff line
		@@ -144,10 +144,9 @@ public class TaskbarDragLayerController implements TaskbarControllers.LoggableTa
		public void dumpLogs(String prefix, PrintWriter pw) {
		pw.println(prefix + "TaskbarDragLayerController:");

		pw.println(String.format("%s\tmBgOffset=%.2f", prefix, mBgOffset.value));
		pw.println(String.format("%s\tmFolderMargin=%dpx", prefix, mFolderMargin));
		pw.println(String.format(
		"%s\tmLastSetBackgroundAlpha=%.2f", prefix, mLastSetBackgroundAlpha));
		pw.println(prefix + "\tmBgOffset=" + mBgOffset.value);
		pw.println(prefix + "\tmFolderMargin=" + mFolderMargin);
		pw.println(prefix + "\tmLastSetBackgroundAlpha=" + mLastSetBackgroundAlpha);
		}

		/**