Merge "Adding some extra logging around draglayer alpha" into ub-launcher3-master

3 files changed, 19 insertions, 0 deletions

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 55d6984f8..0395fbbcc 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -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 {
diff --git a/src/com/android/launcher3/util/MultiValueAlpha.java b/src/com/android/launcher3/util/MultiValueAlpha.java
index f810f483d..07f835d4a 100644
--- a/src/com/android/launcher3/util/MultiValueAlpha.java
+++ b/src/com/android/launcher3/util/MultiValueAlpha.java
@@ -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);
+        }
     }
 }
diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java
index 5b8df1399..4545a1ee7 100644
--- a/src/com/android/launcher3/views/BaseDragLayer.java
+++ b/src/com/android/launcher3/views/BaseDragLayer.java
@@ -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;