Merge "Fix CheckStyle issues in Fragments" into androidx-master-dev

aosp-mirror · Jul 10, 2019 · ddf7531 · ddf7531
2 parents 407cdf8 + 75fe241
commit ddf7531
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 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
@@ -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
@@ -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
@@ -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