Update toString methods for various Embedding... am: d6cf8c85ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16133687 Change-Id: I09a3bbbc943d7d866ef47526afb55e9faf8da122
This commit is contained in:
@@ -213,6 +213,7 @@ public final class TaskFragmentInfo implements Parcelable {
|
|||||||
+ " isEmpty=" + mIsEmpty
|
+ " isEmpty=" + mIsEmpty
|
||||||
+ " runningActivityCount=" + mRunningActivityCount
|
+ " runningActivityCount=" + mRunningActivityCount
|
||||||
+ " isVisible=" + mIsVisible
|
+ " isVisible=" + mIsVisible
|
||||||
|
+ " activities=" + mActivities
|
||||||
+ " positionInParent=" + mPositionInParent
|
+ " positionInParent=" + mPositionInParent
|
||||||
+ " isTaskClearedForReuse=" + mIsTaskClearedForReuse
|
+ " isTaskClearedForReuse=" + mIsTaskClearedForReuse
|
||||||
+ "}";
|
+ "}";
|
||||||
|
|||||||
@@ -83,4 +83,13 @@ class SplitContainer {
|
|||||||
&& ((SplitPairRule) splitRule).shouldFinishSecondaryWithPrimary();
|
&& ((SplitPairRule) splitRule).shouldFinishSecondaryWithPrimary();
|
||||||
return shouldFinishSecondaryWithPrimary || isPlaceholderContainer;
|
return shouldFinishSecondaryWithPrimary || isPlaceholderContainer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "SplitContainer{"
|
||||||
|
+ " primaryContainer=" + mPrimaryContainer
|
||||||
|
+ " secondaryContainer=" + mSecondaryContainer
|
||||||
|
+ " splitRule=" + mSplitRule
|
||||||
|
+ "}";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ import android.window.TaskFragmentInfo;
|
|||||||
import android.window.WindowContainerTransaction;
|
import android.window.WindowContainerTransaction;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -267,4 +268,42 @@ class TaskFragmentContainer {
|
|||||||
mLastRequestedBounds.set(bounds);
|
mLastRequestedBounds.set(bounds);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return toString(true /* includeContainersToFinishOnExit */);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string for this TaskFragmentContainer and includes containers to finish on exit
|
||||||
|
* based on {@code includeContainersToFinishOnExit}. If containers to finish on exit are always
|
||||||
|
* included in the string, then calling {@link #toString()} on a container that mutually
|
||||||
|
* finishes with another container would cause a stack overflow.
|
||||||
|
*/
|
||||||
|
private String toString(boolean includeContainersToFinishOnExit) {
|
||||||
|
return "TaskFragmentContainer{"
|
||||||
|
+ " token=" + mToken
|
||||||
|
+ " info=" + mInfo
|
||||||
|
+ " topNonFinishingActivity=" + getTopNonFinishingActivity()
|
||||||
|
+ " pendingAppearedActivities=" + mPendingAppearedActivities
|
||||||
|
+ (includeContainersToFinishOnExit ? " containersToFinishOnExit="
|
||||||
|
+ containersToFinishOnExitToString() : "")
|
||||||
|
+ " activitiesToFinishOnExit=" + mActivitiesToFinishOnExit
|
||||||
|
+ " isFinished=" + mIsFinished
|
||||||
|
+ " lastRequestedBounds=" + mLastRequestedBounds
|
||||||
|
+ "}";
|
||||||
|
}
|
||||||
|
|
||||||
|
private String containersToFinishOnExitToString() {
|
||||||
|
StringBuilder sb = new StringBuilder("[");
|
||||||
|
Iterator<TaskFragmentContainer> containerIterator = mContainersToFinishOnExit.iterator();
|
||||||
|
while (containerIterator.hasNext()) {
|
||||||
|
sb.append(containerIterator.next().toString(
|
||||||
|
false /* includeContainersToFinishOnExit */));
|
||||||
|
if (containerIterator.hasNext()) {
|
||||||
|
sb.append(", ");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sb.append("]").toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user