From 75fe2417d7448168ceae61a9745e82f9b1b6f038 Mon Sep 17 00:00:00 2001 From: Ian Lake Date: Tue, 9 Jul 2019 15:34:55 -0700 Subject: [PATCH] Fix CheckStyle issues in Fragments Test: CheckStyle passes Change-Id: I4920e4cb541919a9329c2d97afbeec0db2204aba --- .../fragment/app/BackStackRecord.java | 11 +- .../androidx/fragment/app/BackStackState.java | 6 +- .../fragment/app/FragmentManager.java | 4 +- .../fragment/app/FragmentManagerImpl.java | 173 +++++++++++------- 4 files changed, 115 insertions(+), 79 deletions(-) diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/BackStackRecord.java b/fragment/fragment/src/main/java/androidx/fragment/app/BackStackRecord.java index 68a7b4cf9015..5731058a3730 100644 --- a/fragment/fragment/src/main/java/androidx/fragment/app/BackStackRecord.java +++ b/fragment/fragment/src/main/java/androidx/fragment/app/BackStackRecord.java @@ -256,15 +256,18 @@ void bumpBackStackNesting(int amt) { if (!mAddToBackStack) { return; } - if (FragmentManagerImpl.DEBUG) Log.v(TAG, "Bump nesting in " + this - + " by " + amt); + if (FragmentManagerImpl.DEBUG) { + Log.v(TAG, "Bump nesting in " + this + " by " + amt); + } final int numOps = mOps.size(); for (int opNum = 0; opNum < numOps; opNum++) { final Op op = mOps.get(opNum); if (op.mFragment != null) { op.mFragment.mBackStackNesting += amt; - if (FragmentManagerImpl.DEBUG) Log.v(TAG, "Bump nesting of " - + op.mFragment + " to " + op.mFragment.mBackStackNesting); + if (FragmentManagerImpl.DEBUG) { + Log.v(TAG, "Bump nesting of " + + op.mFragment + " to " + op.mFragment.mBackStackNesting); + } } } } diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/BackStackState.java b/fragment/fragment/src/main/java/androidx/fragment/app/BackStackState.java index be970921e7ab..0e5b8c45ee24 100644 --- a/fragment/fragment/src/main/java/androidx/fragment/app/BackStackState.java +++ b/fragment/fragment/src/main/java/androidx/fragment/app/BackStackState.java @@ -102,8 +102,10 @@ public BackStackRecord instantiate(FragmentManagerImpl fm) { while (pos < mOps.length) { BackStackRecord.Op op = new BackStackRecord.Op(); op.mCmd = mOps[pos++]; - if (FragmentManagerImpl.DEBUG) Log.v(FragmentManagerImpl.TAG, - "Instantiate " + bse + " op #" + num + " base fragment #" + mOps[pos]); + if (FragmentManagerImpl.DEBUG) { + Log.v(FragmentManagerImpl.TAG, "Instantiate " + bse + + " op #" + num + " base fragment #" + mOps[pos]); + } String fWho = mFragmentWhos.get(num); if (fWho != null) { Fragment f = fm.mActive.get(fWho); diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java index 26d2247fb463..c257cb137fb5 100644 --- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java +++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java @@ -136,7 +136,7 @@ public interface OnBackStackChangedListener { /** * @hide -- remove once prebuilts are in. - * @deprecated + * @deprecated Use {@link #beginTransaction()}. */ @RestrictTo(LIBRARY_GROUP_PREFIX) @Deprecated @@ -198,7 +198,7 @@ public FragmentTransaction openTransaction() { * the stack is reached. Otherwise, all entries up to but not including that entry * will be removed. */ - public static final int POP_BACK_STACK_INCLUSIVE = 1<<0; + public static final int POP_BACK_STACK_INCLUSIVE = 1; /** * Pop the top state off the back stack. This function is asynchronous -- it enqueues the diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManagerImpl.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManagerImpl.java index 3b0e24ebb687..e42212fcd19d 100644 --- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManagerImpl.java +++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManagerImpl.java @@ -445,7 +445,7 @@ int getActiveFragmentCount() { @Nullable public Fragment.SavedState saveFragmentInstanceState(@NonNull Fragment fragment) { if (fragment.mFragmentManager != this) { - throwException( new IllegalStateException("Fragment " + fragment + throwException(new IllegalStateException("Fragment " + fragment + " is not currently in the FragmentManager")); } if (fragment.mState > Fragment.INITIALIZING) { @@ -481,21 +481,23 @@ public void dump(@NonNull String prefix, @Nullable FileDescriptor fd, String innerPrefix = prefix + " "; if (!mActive.isEmpty()) { - writer.print(prefix); writer.print("Active Fragments in "); + writer.print(prefix); + writer.print("Active Fragments in "); writer.print(Integer.toHexString(System.identityHashCode(this))); writer.println(":"); for (Fragment f : mActive.values()) { - writer.print(prefix); writer.println(f); + writer.print(prefix); + writer.println(f); if (f != null) { f.dump(innerPrefix, fd, writer, args); } } } - int N = mAdded.size(); - if (N > 0) { + int count = mAdded.size(); + if (count > 0) { writer.print(prefix); writer.println("Added Fragments:"); - for (int i = 0; i < N; i++) { + for (int i = 0; i < count; i++) { Fragment f = mAdded.get(i); writer.print(prefix); writer.print(" #"); @@ -506,71 +508,97 @@ public void dump(@NonNull String prefix, @Nullable FileDescriptor fd, } if (mCreatedMenus != null) { - N = mCreatedMenus.size(); - if (N > 0) { + count = mCreatedMenus.size(); + if (count > 0) { writer.print(prefix); writer.println("Fragments Created Menus:"); - for (int i=0; i 0) { + count = mBackStack.size(); + if (count > 0) { writer.print(prefix); writer.println("Back Stack:"); - for (int i=0; i 0) { + count = mBackStackIndices.size(); + if (count > 0) { writer.print(prefix); writer.println("Back Stack Indices:"); - for (int i = 0; i < N; i++) { + for (int i = 0; i < count; i++) { BackStackRecord bs = mBackStackIndices.get(i); - writer.print(prefix); writer.print(" #"); writer.print(i); - writer.print(": "); writer.println(bs); + writer.print(prefix); + writer.print(" #"); + writer.print(i); + writer.print(": "); + writer.println(bs); } } if (!mAvailBackStackIndices.isEmpty()) { - writer.print(prefix); writer.print("mAvailBackStackIndices: "); + writer.print(prefix); + writer.print("mAvailBackStackIndices: "); writer.println(Arrays.toString(mAvailBackStackIndices.toArray())); } } synchronized (mPendingActions) { - N = mPendingActions.size(); - if (N > 0) { + count = mPendingActions.size(); + if (count > 0) { writer.print(prefix); writer.println("Pending Actions:"); - for (int i = 0; i < N; i++) { + for (int i = 0; i < count; i++) { OpGenerator r = mPendingActions.get(i); - writer.print(prefix); writer.print(" #"); writer.print(i); - writer.print(": "); writer.println(r); + writer.print(prefix); + writer.print(" #"); + writer.print(i); + writer.print(": "); + writer.println(r); } } } - writer.print(prefix); writer.println("FragmentManager misc state:"); - writer.print(prefix); writer.print(" mHost="); writer.println(mHost); - writer.print(prefix); writer.print(" mContainer="); writer.println(mContainer); + writer.print(prefix); + writer.println("FragmentManager misc state:"); + writer.print(prefix); + writer.print(" mHost="); + writer.println(mHost); + writer.print(prefix); + writer.print(" mContainer="); + writer.println(mContainer); if (mParent != null) { - writer.print(prefix); writer.print(" mParent="); writer.println(mParent); - } - writer.print(prefix); writer.print(" mCurState="); writer.print(mCurState); - writer.print(" mStateSaved="); writer.print(mStateSaved); - writer.print(" mStopped="); writer.print(mStopped); - writer.print(" mDestroyed="); writer.println(mDestroyed); + writer.print(prefix); + writer.print(" mParent="); + writer.println(mParent); + } + writer.print(prefix); + writer.print(" mCurState="); + writer.print(mCurState); + writer.print(" mStateSaved="); + writer.print(mStateSaved); + writer.print(" mStopped="); + writer.print(mStopped); + writer.print(" mDestroyed="); + writer.println(mDestroyed); if (mNeedMenuInvalidate) { - writer.print(prefix); writer.print(" mNeedMenuInvalidate="); + writer.print(prefix); + writer.print(" mNeedMenuInvalidate="); writer.println(mNeedMenuInvalidate); } } @@ -1017,7 +1045,7 @@ void moveToState(Fragment f, int newState, int transit, boolean keepActive) { * @param newState The final state after animating. */ private void animateRemoveFragment(@NonNull final Fragment fragment, - @NonNull AnimationOrAnimator anim, final int newState) { + @NonNull AnimationOrAnimator anim, final int newState) { final View viewToAnimate = fragment.mView; final ViewGroup container = fragment.mContainer; container.startViewTransition(viewToAnimate); @@ -1447,7 +1475,7 @@ public Fragment findFragmentById(int id) { public Fragment findFragmentByTag(@Nullable String tag) { if (tag != null) { // First look through added fragments. - for (int i=mAdded.size()-1; i>=0; i--) { + for (int i = mAdded.size() - 1; i >= 0; i--) { Fragment f = mAdded.get(i); if (f != null && tag.equals(f.mTag)) { return f; @@ -1542,7 +1570,7 @@ int allocBackStackIndex(BackStackRecord bse) { return index; } else { - int index = mAvailBackStackIndices.remove(mAvailBackStackIndices.size()-1); + int index = mAvailBackStackIndices.remove(mAvailBackStackIndices.size() - 1); if (DEBUG) Log.v(TAG, "Adding back stack index " + index + " with " + bse); mBackStackIndices.set(index, bse); return index; @@ -1552,16 +1580,16 @@ int allocBackStackIndex(BackStackRecord bse) { private void setBackStackIndex(int index, BackStackRecord bse) { synchronized (mBackStackIndices) { - int N = mBackStackIndices.size(); - if (index < N) { + int count = mBackStackIndices.size(); + if (index < count) { if (DEBUG) Log.v(TAG, "Setting back stack index " + index + " to " + bse); mBackStackIndices.set(index, bse); } else { - while (N < index) { + while (count < index) { mBackStackIndices.add(null); - if (DEBUG) Log.v(TAG, "Adding available back stack index " + N); - mAvailBackStackIndices.add(N); - N++; + if (DEBUG) Log.v(TAG, "Adding available back stack index " + count); + mAvailBackStackIndices.add(count); + count++; } if (DEBUG) Log.v(TAG, "Adding back stack index " + index + " with " + bse); mBackStackIndices.add(bse); @@ -1671,7 +1699,7 @@ boolean execPendingActions() { * now ready. */ private void executePostponedTransaction(ArrayList records, - ArrayList isRecordPop) { + ArrayList isRecordPop) { int numPostponed = mPostponedTransactions == null ? 0 : mPostponedTransactions.size(); for (int i = 0; i < numPostponed; i++) { StartEnterTransitionListener listener = mPostponedTransactions.get(i); @@ -1715,7 +1743,7 @@ private void executePostponedTransaction(ArrayList records, * @param isRecordPop The direction that these records are being run. */ private void removeRedundantOperationsAndExecute(ArrayList records, - ArrayList isRecordPop) { + ArrayList isRecordPop) { if (records == null || records.isEmpty()) { return; } @@ -1765,7 +1793,7 @@ private void removeRedundantOperationsAndExecute(ArrayList reco * @param endIndex One more than the final record index in records to executed. */ private void executeOpsTogether(ArrayList records, - ArrayList isRecordPop, int startIndex, int endIndex) { + ArrayList isRecordPop, int startIndex, int endIndex) { final boolean allowReordering = records.get(startIndex).mReorderingAllowed; boolean addToBackStack = false; if (mTmpAddedFragments == null) { @@ -1855,8 +1883,8 @@ private void makeRemovedFragmentsInvisible(ArraySet fragments) { * postponed. */ private int postponePostponableTransactions(ArrayList records, - ArrayList isRecordPop, int startIndex, int endIndex, - ArraySet added) { + ArrayList isRecordPop, int startIndex, int endIndex, + ArraySet added) { int postponeIndex = endIndex; for (int i = endIndex - 1; i >= startIndex; i--) { final BackStackRecord record = records.get(i); @@ -1989,7 +2017,7 @@ private Fragment findFragmentUnder(Fragment f) { * @param endIndex One past the index of the final entry in records to run. */ private static void executeOps(ArrayList records, - ArrayList isRecordPop, int startIndex, int endIndex) { + ArrayList isRecordPop, int startIndex, int endIndex) { for (int i = startIndex; i < endIndex; i++) { final BackStackRecord record = records.get(i); final boolean isPop = isRecordPop.get(i); @@ -2079,7 +2107,7 @@ private void endAnimatingAwayFragments() { * pop action. */ private boolean generateOpsForPendingActions(ArrayList records, - ArrayList isPop) { + ArrayList isPop) { boolean didSomething = false; synchronized (mPendingActions) { if (mPendingActions.isEmpty()) { @@ -2105,7 +2133,7 @@ private void doPendingDeferredStart() { private void reportBackStackChanged() { if (mBackStackChangeListeners != null) { - for (int i=0; i records, if (name != null || id >= 0) { // If a name or ID is specified, look for that place in // the stack. - index = mBackStack.size()-1; + index = mBackStack.size() - 1; while (index >= 0) { BackStackRecord bss = mBackStack.get(index); if (name != null && name.equals(bss.getName())) { @@ -2150,7 +2178,7 @@ boolean popBackStackState(ArrayList records, if (index < 0) { return false; } - if ((flags&POP_BACK_STACK_INCLUSIVE) != 0) { + if ((flags & POP_BACK_STACK_INCLUSIVE) != 0) { index--; // Consume all following entries that match. while (index >= 0) { @@ -2164,7 +2192,7 @@ boolean popBackStackState(ArrayList records, } } } - if (index == mBackStack.size()-1) { + if (index == mBackStack.size() - 1) { return false; } for (int i = mBackStack.size() - 1; i > index; i--) { @@ -2295,8 +2323,9 @@ Parcelable saveAllState() { fs.mSavedFragmentState = f.mSavedFragmentState; } - if (DEBUG) Log.v(TAG, "Saved state of " + f + ": " - + fs.mSavedFragmentState); + if (DEBUG) { + Log.v(TAG, "Saved state of " + f + ": " + fs.mSavedFragmentState); + } } } @@ -2333,8 +2362,10 @@ Parcelable saveAllState() { backStack = new BackStackState[size]; for (int i = 0; i < size; i++) { backStack[i] = new BackStackState(mBackStack.get(i)); - if (DEBUG) Log.v(TAG, "saveAllState: adding back stack #" + i - + ": " + mBackStack.get(i)); + if (DEBUG) { + Log.v(TAG, "saveAllState: adding back stack #" + i + + ": " + mBackStack.get(i)); + } } } } @@ -2362,7 +2393,7 @@ void restoreAllState(Parcelable state, FragmentManagerNonConfig nonConfig) { void restoreSaveState(Parcelable state) { // If there is no saved state at all, then there's nothing else to do if (state == null) return; - FragmentManagerState fms = (FragmentManagerState)state; + FragmentManagerState fms = (FragmentManagerState) state; if (fms.mActive == null) return; // First re-attach any non-config instances we are retaining back @@ -2444,7 +2475,7 @@ void restoreSaveState(Parcelable state) { // Build the back stack. if (fms.mBackStack != null) { mBackStack = new ArrayList<>(fms.mBackStack.length); - for (int i=0; i records, - ArrayList isRecordPop) { + ArrayList isRecordPop) { if (mPrimaryNav != null // We have a primary nav fragment && mId < 0 // No valid id (since they're local) && mName == null) { // no name to pop to (since they're local) @@ -3237,7 +3268,7 @@ private static class EndViewTransitionAnimation extends AnimationSet implements private boolean mAnimating = true; EndViewTransitionAnimation(@NonNull Animation animation, - @NonNull ViewGroup parent, @NonNull View child) { + @NonNull ViewGroup parent, @NonNull View child) { super(false); mParent = parent; mChild = child; @@ -3262,8 +3293,8 @@ public boolean getTransformation(long currentTime, Transformation t) { } @Override - public boolean getTransformation(long currentTime, Transformation outTransformation, - float scale) { + public boolean getTransformation(long currentTime, + Transformation outTransformation, float scale) { mAnimating = true; if (mEnded) { return !mTransitionEnded;