Add important dump logging
Bug: 130851537
Bug: 119992316
Change-Id: I3de7c1d910d1aecd80b47a85284565c79fe0e2cc
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index d6f992f..bd58499 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -41,6 +41,7 @@
import com.android.launcher3.views.ActivityContext;
import com.android.launcher3.views.BaseDragLayer;
+import java.io.PrintWriter;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -251,4 +252,7 @@
@FloatingViewType int type) {
return getOpenView(activity, type);
}
+
+ @Override
+ public void dump(String prefix, PrintWriter writer) { }
}
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index d790c04..bdb71d2 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2345,7 +2345,8 @@
writer.println(" mPendingActivityResult=" + mPendingActivityResult);
writer.println(" mRotationHelper: " + mRotationHelper);
// Extra logging for b/116853349
- mDragLayer.dumpAlpha(writer);
+ mDragLayer.dump(prefix, writer);
+ mStateManager.dump(prefix, writer);
dumpMisc(writer);
try {
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index 209578d..b24f660 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -50,6 +50,7 @@
import com.android.launcher3.anim.PropertySetter.AnimatedPropertySetter;
import com.android.launcher3.uioverrides.UiFactory;
+import java.io.PrintWriter;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
@@ -144,6 +145,15 @@
return mCurrentStableState;
}
+ public void dump(String prefix, PrintWriter writer) {
+ writer.println(prefix + "LauncherState");
+ writer.println(prefix + "\tmLastStableState:" + mLastStableState);
+ writer.println(prefix + "\tmCurrentStableState:" + mCurrentStableState);
+ writer.println(prefix + "\tmState:" + mState);
+ writer.println(prefix + "\tmRestState:" + mRestState);
+ writer.println(prefix + "\tisInTransition:" + (mConfig.mCurrentAnimation != null));
+ }
+
public StateHandler[] getStateHandlers() {
if (mStateHandlers == null) {
mStateHandlers = UiFactory.getStateHandler(mLauncher);
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index 4d45ba9..5c3d4fb 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -46,6 +46,7 @@
import com.android.launcher3.util.TouchController;
import com.android.launcher3.util.UiThreadHelper;
+import java.io.PrintWriter;
import java.util.ArrayList;
/**
@@ -697,4 +698,7 @@
mDropTargets.remove(target);
}
+ @Override
+ public void dump(String prefix, PrintWriter writer) { }
+
}
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 0274de3..5f40dce 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -50,6 +50,8 @@
import com.android.launcher3.util.PendingAnimation;
import com.android.launcher3.util.TouchController;
+import java.io.PrintWriter;
+
/**
* TouchController for handling state changes
*/
@@ -581,4 +583,7 @@
this.endTime = duration + SystemClock.elapsedRealtime();
}
}
+
+ @Override
+ public void dump(String prefix, PrintWriter writer) { }
}
diff --git a/src/com/android/launcher3/util/TouchController.java b/src/com/android/launcher3/util/TouchController.java
index 3cca215..ac6a5bd 100644
--- a/src/com/android/launcher3/util/TouchController.java
+++ b/src/com/android/launcher3/util/TouchController.java
@@ -18,6 +18,8 @@
import android.view.MotionEvent;
+import java.io.PrintWriter;
+
public interface TouchController {
/**
@@ -29,4 +31,6 @@
* Called when the draglayer receives a intercept touch event.
*/
boolean onControllerInterceptTouchEvent(MotionEvent ev);
+
+ void dump(String prefix, PrintWriter writer);
}
diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java
index ab72bbe..66cd536 100644
--- a/src/com/android/launcher3/views/BaseDragLayer.java
+++ b/src/com/android/launcher3/views/BaseDragLayer.java
@@ -383,8 +383,13 @@
return mMultiValueAlpha.getProperty(index);
}
- public void dumpAlpha(PrintWriter writer) {
- writer.println(" dragLayerAlpha : " + mMultiValueAlpha );
+ public void dump(String prefix, PrintWriter writer) {
+ writer.println(prefix + "DragLayer");
+ if (mActiveController != null) {
+ writer.println(prefix + "\tactiveController: " + mActiveController);
+ mActiveController.dump(prefix + "\t", writer);
+ }
+ writer.println(prefix + "\tdragLayerAlpha : " + mMultiValueAlpha );
}
public static class LayoutParams extends InsettableFrameLayout.LayoutParams {