Merge "Add dumping information to ImeBackAnimationController" into main
diff --git a/core/java/android/view/ImeBackAnimationController.java b/core/java/android/view/ImeBackAnimationController.java
index 4530157..9503f49 100644
--- a/core/java/android/view/ImeBackAnimationController.java
+++ b/core/java/android/view/ImeBackAnimationController.java
@@ -38,6 +38,8 @@
import com.android.internal.inputmethod.SoftInputShowHideReason;
+import java.io.PrintWriter;
+
/**
* Controller for IME predictive back animation
*
@@ -271,4 +273,24 @@
return mPostCommitAnimator != null && mTriggerBack;
}
+ /**
+ * Dump information about this ImeBackAnimationController
+ *
+ * @param prefix the prefix that will be prepended to each line of the produced output
+ * @param writer the writer that will receive the resulting text
+ */
+ public void dump(String prefix, PrintWriter writer) {
+ final String innerPrefix = prefix + " ";
+ writer.println(prefix + "ImeBackAnimationController:");
+ writer.println(innerPrefix + "mLastProgress=" + mLastProgress);
+ writer.println(innerPrefix + "mTriggerBack=" + mTriggerBack);
+ writer.println(innerPrefix + "mIsPreCommitAnimationInProgress="
+ + mIsPreCommitAnimationInProgress);
+ writer.println(innerPrefix + "mStartRootScrollY=" + mStartRootScrollY);
+ writer.println(innerPrefix + "isBackAnimationAllowed=" + isBackAnimationAllowed());
+ writer.println(innerPrefix + "isAdjustPan=" + isAdjustPan());
+ writer.println(innerPrefix + "isHideAnimationInProgress="
+ + isHideAnimationInProgress());
+ }
+
}
diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java
index c545267..f1cb410 100644
--- a/core/java/android/view/InsetsController.java
+++ b/core/java/android/view/InsetsController.java
@@ -1799,8 +1799,11 @@
}
void dump(String prefix, PrintWriter pw) {
- pw.print(prefix); pw.println("InsetsController:");
- mState.dump(prefix + " ", pw);
+ final String innerPrefix = prefix + " ";
+ pw.println(prefix + "InsetsController:");
+ mState.dump(innerPrefix, pw);
+ pw.println(innerPrefix + "mIsPredictiveBackImeHideAnimInProgress="
+ + mIsPredictiveBackImeHideAnimInProgress);
}
void dumpDebug(ProtoOutputStream proto, long fieldId) {
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index db55a9d..7d22e94 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -9601,6 +9601,8 @@
mOnBackInvokedDispatcher.dump(prefix, writer);
+ mImeBackAnimationController.dump(prefix, writer);
+
writer.println(prefix + "View Hierarchy:");
dumpViewHierarchy(innerPrefix, writer, mView);
}