Merge "Expand dumpsys coverage to all known factors in empty expanded view issues." into rvc-dev (d65287ec) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -506,6 +506,14 @@ public class BubbleExpandedView extends LinearLayout {
		}
		}

		@Nullable ActivityView getActivityView() {
		return mActivityView;
		}

		int getTaskId() {
		return mTaskId;
		}

		/**
		* Called by {@link BubbleStackView} when the insets for the expanded state should be updated.
		* This should be done post-move and post-animation.

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+35 −3

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ValueAnimator;
		import android.annotation.SuppressLint;
		import android.app.ActivityView;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		@@ -296,8 +297,39 @@ public class BubbleStackView extends FrameLayout
		pw.print(" gestureInProgress: "); pw.println(mIsGestureInProgress);
		pw.print(" showingDismiss: "); pw.println(mShowingDismiss);
		pw.print(" isExpansionAnimating: "); pw.println(mIsExpansionAnimating);
		pw.print(" expandedContainerVis: "); pw.println(mExpandedViewContainer.getVisibility());
		pw.print(" expandedContainerAlpha: "); pw.println(mExpandedViewContainer.getAlpha());
		pw.print(" expandedContainerMatrix: ");
		pw.println(mExpandedViewContainer.getAnimationMatrix());

		mStackAnimationController.dump(fd, pw, args);
		mExpandedAnimationController.dump(fd, pw, args);

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

		final BubbleExpandedView expandedView = mExpandedBubble.getExpandedView();

		if (expandedView != null) {
		pw.println(" expandedViewVis: " + expandedView.getVisibility());
		pw.println(" expandedViewAlpha: " + expandedView.getAlpha());
		pw.println(" expandedViewTaskId: " + expandedView.getTaskId());

		final ActivityView av = expandedView.getActivityView();

		if (av != null) {
		pw.println(" activityViewVis: " + av.getVisibility());
		pw.println(" activityViewAlpha: " + av.getAlpha());
		} else {
		pw.println(" activityView is null");
		}
		} else {
		pw.println("Expanded bubble view state: expanded bubble view is null");
		}
		} else {
		pw.println("Expanded bubble state: expanded bubble is null");
		}
		}

		private BubbleController.BubbleExpandListener mExpandListener;