Merge "Add more info to dumpsys for floating" into main (b2529d15) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -1223,5 +1223,8 @@ public class BubbleExpandedView extends LinearLayout {
		}
		pw.print(prefix); pw.print(" v-alpha: "); pw.println(getAlpha());
		pw.print(prefix); pw.print(" v-viewVis: "); pw.println(getVisibility());
		pw.print(prefix); pw.print(" isClipping: "); pw.println(mIsClipping);
		pw.print(prefix); pw.print(" clipRect: "); pw.println(
		new Rect(mLeftClip, mTopClip, mRightClip, mBottomClip));
		}
		}

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -360,6 +360,7 @@ public class BubbleStackView extends FrameLayout
		pw.print(" expandedViewTemporarilyHidden: "); pw.println(mExpandedViewTemporarilyHidden);
		mStackAnimationController.dump(pw);
		mExpandedAnimationController.dump(pw);
		mExpandedViewAnimationController.dump(pw);

		if (mExpandedBubble != null) {
		pw.println("Expanded bubble state:");

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/ExpandedViewAnimationController.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -15,10 +15,13 @@
		*/
		package com.android.wm.shell.bubbles.animation;

		import android.annotation.NonNull;
		import android.graphics.PointF;

		import com.android.wm.shell.bubbles.BubbleExpandedView;

		import java.io.PrintWriter;

		/**
		* Animation controller for bubble expanded view collapsing
		*/
		@@ -91,4 +94,9 @@ public interface ExpandedViewAnimationController {
		* Reset the view to fully expanded state
		*/
		void reset();

		/**
		* Description of current animation controller state
		*/
		void dump(@NonNull PrintWriter pw);
		}

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/ExpandedViewAnimationControllerImpl.java

+29 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.animation.AnimatorListenerAdapter;
		import android.animation.AnimatorSet;
		import android.animation.ObjectAnimator;
		import android.animation.ValueAnimator;
		import android.annotation.NonNull;
		import android.annotation.SuppressLint;
		import android.content.Context;
		import android.graphics.PointF;
		@@ -46,6 +47,7 @@ import com.android.wm.shell.bubbles.BubbleExpandedView;
		import com.android.wm.shell.bubbles.BubblePositioner;
		import com.android.wm.shell.shared.animation.Interpolators;

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

		@@ -428,4 +430,31 @@ public class ExpandedViewAnimationControllerImpl implements ExpandedViewAnimatio
		mExpandedView.performHapticFeedback(HapticFeedbackConstants.DRAG_CROSSING);
		}
		}

		/** Description of current animation controller state. */
		@Override
		public void dump(@NonNull PrintWriter pw) {
		pw.println("ExpandedViewAnimationController:");
		pw.print(" expandedView: "); pw.println(mExpandedView);
		pw.print(" collapsedAmount: "); pw.println(mCollapsedAmount);
		pw.print(" notifiedAboutThreshold: "); pw.println(mNotifiedAboutThreshold);
		if (mCollapseAnimation != null) {
		pw.print(" collapseAnimation running: ");
		pw.println(mCollapseAnimation.isRunning());
		} else {
		pw.println(" collapseAnimation=null");
		}
		if (mBackToExpandedAnimation != null) {
		pw.print(" backToExpandedAnimation running: ");
		pw.println(mBackToExpandedAnimation.isRunning());
		} else {
		pw.println(" backToExpandedAnimation=null");
		}
		if (mBottomClipAnim != null) {
		pw.print(" bottomClipAnim running: ");
		pw.println(mBottomClipAnim.isRunning());
		} else {
		pw.println(" bottomClipAnim=null");
		}
		}
		}