Merge "Adding some extra logging around draglayer alpha" into ub-launcher3-master (55ba0dca) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -2285,6 +2285,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		writer.print(" mPendingRequestArgs=" + mPendingRequestArgs);
		writer.println(" mPendingActivityResult=" + mPendingActivityResult);
		writer.println(" mRotationHelper: " + mRotationHelper);
		// Extra logging for b/116853349
		mDragLayer.dumpAlpha(writer);
		dumpMisc(writer);

		try {

+12 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ package com.android.launcher3.util;
		import android.util.Property;
		import android.view.View;

		import java.util.Arrays;

		/**
		* Utility class to handle separating a single value as a factor of multiple values
		*/
		@@ -55,6 +57,11 @@ public class MultiValueAlpha {
		}
		}

		@Override
		public String toString() {
		return Arrays.toString(mMyProperties);
		}

		public AlphaProperty getProperty(int index) {
		return mMyProperties[index];
		}
		@@ -97,5 +104,10 @@ public class MultiValueAlpha {
		public float getValue() {
		return mValue;
		}

		@Override
		public String toString() {
		return Float.toString(mValue);
		}
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import com.android.launcher3.util.MultiValueAlpha;
		import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
		import com.android.launcher3.util.TouchController;

		import java.io.PrintWriter;
		import java.util.ArrayList;

		/**
		@@ -357,6 +358,10 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
		return mMultiValueAlpha.getProperty(index);
		}

		public void dumpAlpha(PrintWriter writer) {
		writer.println(" dragLayerAlpha : " + mMultiValueAlpha );
		}

		public static class LayoutParams extends InsettableFrameLayout.LayoutParams {
		public int x, y;
		public boolean customPosition = false;