diff options
| author | Chris Li <lihongyu@google.com> | 2022-08-11 13:51:30 +0800 |
|---|---|---|
| committer | Chris Li <lihongyu@google.com> | 2022-08-17 08:46:28 +0800 |
| commit | 99da16cdc8f0583b2f8b76c2f68f03d378b0e3b7 (patch) | |
| tree | 1e7525a5f29626bfc14f3cb5a5cf945e0cad069a /core/java/android/window/TaskFragmentTransaction.java | |
| parent | fe1eba3a8866b8eb1363263577e8d825ff42f021 (diff) | |
Address TaskFragmentOrganizer style comments
1. Rename onActivityReparentToTask to onActivityReparentedToTask
2. Annotate @NonNull and @Nullable for the Extensions methods that are
not yet annotated.
Bug: 240519866
Test: Refactor and add annotation. Pass existing tests.
Change-Id: I85c5927e6e7261cae3bce715b1955523d430e1e2
Diffstat (limited to 'core/java/android/window/TaskFragmentTransaction.java')
| -rw-r--r-- | core/java/android/window/TaskFragmentTransaction.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/window/TaskFragmentTransaction.java b/core/java/android/window/TaskFragmentTransaction.java index 755864f60f87..07e8e8c473c6 100644 --- a/core/java/android/window/TaskFragmentTransaction.java +++ b/core/java/android/window/TaskFragmentTransaction.java @@ -122,7 +122,7 @@ public final class TaskFragmentTransaction implements Parcelable { * then exits Picture-in-picture, it will be reparented back to its original Task. In this case, * we need to notify the organizer so that it can check if the Activity matches any split rule. */ - public static final int TYPE_ACTIVITY_REPARENT_TO_TASK = 6; + public static final int TYPE_ACTIVITY_REPARENTED_TO_TASK = 6; @IntDef(prefix = { "TYPE_" }, value = { TYPE_TASK_FRAGMENT_APPEARED, @@ -130,7 +130,7 @@ public final class TaskFragmentTransaction implements Parcelable { TYPE_TASK_FRAGMENT_VANISHED, TYPE_TASK_FRAGMENT_PARENT_INFO_CHANGED, TYPE_TASK_FRAGMENT_ERROR, - TYPE_ACTIVITY_REPARENT_TO_TASK + TYPE_ACTIVITY_REPARENTED_TO_TASK }) @Retention(RetentionPolicy.SOURCE) @interface ChangeType {} @@ -247,7 +247,7 @@ public final class TaskFragmentTransaction implements Parcelable { /** * Intent of the activity that is reparented to the Task for - * {@link #TYPE_ACTIVITY_REPARENT_TO_TASK}. + * {@link #TYPE_ACTIVITY_REPARENTED_TO_TASK}. */ public Change setActivityIntent(@NonNull Intent intent) { mActivityIntent = requireNonNull(intent); @@ -255,7 +255,7 @@ public final class TaskFragmentTransaction implements Parcelable { } /** - * Token of the reparent activity for {@link #TYPE_ACTIVITY_REPARENT_TO_TASK}. + * Token of the reparent activity for {@link #TYPE_ACTIVITY_REPARENTED_TO_TASK}. * If the activity belongs to the same process as the organizer, this will be the actual * activity token; if the activity belongs to a different process, the server will generate * a temporary token that the organizer can use to reparent the activity through |