Fix a bunch of API review bugs.

3362464 API REVIEW: android.content potpourri
3362445 API REVIEW: Fragment transaction stuff
3362428 API REVIEW: Fragment stuff
3362418 API REVIEW: Loader stuff
3362414 API REVIEW: android.content.pm.ActivityInfo

Change-Id: I6475421a4735759b458acb67df4380cc6234f147

6 files changed, 65 insertions, 35 deletions

diff --git a/core/java/android/app/BackStackRecord.java b/core/java/android/app/BackStackRecord.java
index 33b747c..1d217f0 100644
--- a/core/java/android/app/BackStackRecord.java
+++ b/core/java/android/app/BackStackRecord.java
@@ -267,6 +267,14 @@ final class BackStackRecord extends FragmentTransaction implements
         return mIndex;
     }
 
+    public int getBreadCrumbTitleRes() {
+        return mBreadCrumbTitleRes;
+    }
+
+    public int getBreadCrumbShortTitleRes() {
+        return mBreadCrumbShortTitleRes;
+    }
+
     public CharSequence getBreadCrumbTitle() {
         if (mBreadCrumbTitleRes != 0) {
             return mManager.mActivity.getText(mBreadCrumbTitleRes);
diff --git a/core/java/android/app/DialogFragment.java b/core/java/android/app/DialogFragment.java
index 6f25293..0bc89e7 100644
--- a/core/java/android/app/DialogFragment.java
+++ b/core/java/android/app/DialogFragment.java
@@ -295,7 +295,7 @@ public class DialogFragment extends Fragment
     /**
      * Return the current value of {@link #setCancelable(boolean)}.
      */
-    public boolean getCancelable() {
+    public boolean isCancelable() {
         return mCancelable;
     }
 
diff --git a/core/java/android/app/FragmentBreadCrumbs.java b/core/java/android/app/FragmentBreadCrumbs.java
index fb89099..72a8e9a 100644
--- a/core/java/android/app/FragmentBreadCrumbs.java
+++ b/core/java/android/app/FragmentBreadCrumbs.java
@@ -204,13 +204,13 @@ public class FragmentBreadCrumbs extends ViewGroup
 
     void updateCrumbs() {
         FragmentManager fm = mActivity.getFragmentManager();
-        int numEntries = fm.countBackStackEntries();
+        int numEntries = fm.getBackStackEntryCount();
         int numPreEntries = getPreEntryCount();
         int numViews = mContainer.getChildCount();
         for (int i = 0; i < numEntries + numPreEntries; i++) {
             BackStackEntry bse = i < numPreEntries
                     ? getPreEntry(i)
-                    : fm.getBackStackEntry(i - numPreEntries);
+                    : fm.getBackStackEntryAt(i - numPreEntries);
             if (i < numViews) {
                 View v = mContainer.getChildAt(i);
                 Object tag = v.getTag();
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
index e35ef87..0ead5d6 100644
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -49,7 +49,7 @@ public abstract class FragmentManager {
      * Representation of an entry on the fragment back stack, as created
      * with {@link FragmentTransaction#addToBackStack(String)
      * FragmentTransaction.addToBackStack()}.  Entries can later be
-     * retrieved with {@link FragmentManager#getBackStackEntry(int)
+     * retrieved with {@link FragmentManager#getBackStackEntryAt(int)
      * FragmentManager.getBackStackEntry()}.
      *
      * <p>Note that you should never hold on to a BackStackEntry object;
@@ -65,6 +65,18 @@ public abstract class FragmentManager {
         public int getId();
 
         /**
+         * Return the full bread crumb title resource identifier for the entry,
+         * or 0 if it does not have one.
+         */
+        public int getBreadCrumbTitleRes();
+
+        /**
+         * Return the short bread crumb title resource identifier for the entry,
+         * or 0 if it does not have one.
+         */
+        public int getBreadCrumbShortTitleRes();
+
+        /**
          * Return the full bread crumb title for the entry, or null if it
          * does not have one.
          */
@@ -102,7 +114,8 @@ public abstract class FragmentManager {
      */
     public abstract FragmentTransaction beginTransaction();
 
-    /** Old API */
+    /** @deprecated Old API */
+    @Deprecated
     public FragmentTransaction openTransaction() {
         return beginTransaction();
     }
@@ -153,7 +166,9 @@ public abstract class FragmentManager {
 
     /**
      * Pop the top state off the back stack.  Returns true if there was one
-     * to pop, else false.
+     * to pop, else false.  This function is asynchronous -- it enqueues the
+     * request to pop, but the action will not be performed until the application
+     * returns to its event loop.
      */
     public abstract void popBackStack();
 
@@ -168,6 +183,10 @@ public abstract class FragmentManager {
     /**
      * Pop the last fragment transition from the manager's fragment
      * back stack.  If there is nothing to pop, false is returned.
+     * This function is asynchronous -- it enqueues the
+     * request to pop, but the action will not be performed until the application
+     * returns to its event loop.
+     * 
      * @param name If non-null, this is the name of a previous back state
      * to look for; if found, all states up to that state will be popped.  The
      * {@link #POP_BACK_STACK_INCLUSIVE} flag can be used to control whether
@@ -186,6 +205,10 @@ public abstract class FragmentManager {
 
     /**
      * Pop all back stack states up to the one with the given identifier.
+     * This function is asynchronous -- it enqueues the
+     * request to pop, but the action will not be performed until the application
+     * returns to its event loop.
+     * 
      * @param id Identifier of the stated to be popped. If no identifier exists,
      * false is returned.
      * The identifier is the number returned by
@@ -207,14 +230,24 @@ public abstract class FragmentManager {
     /**
      * Return the number of entries currently in the back stack.
      */
-    public abstract int countBackStackEntries();
+    public abstract int getBackStackEntryCount();
 
+    @Deprecated
+    public int countBackStackEntries() {
+        return getBackStackEntryCount();
+    }
+    
     /**
      * Return the BackStackEntry at index <var>index</var> in the back stack;
      * entries start index 0 being the bottom of the stack.
      */
-    public abstract BackStackEntry getBackStackEntry(int index);
+    public abstract BackStackEntry getBackStackEntryAt(int index);
 
+    @Deprecated
+    public BackStackEntry getBackStackEntry(int index) {
+        return getBackStackEntryAt(index);
+    }
+    
     /**
      * Add a new listener for changes to the fragment back stack.
      */
@@ -416,12 +449,12 @@ final class FragmentManagerImpl extends FragmentManager {
     }
 
     @Override
-    public int countBackStackEntries() {
+    public int getBackStackEntryCount() {
         return mBackStack != null ? mBackStack.size() : 0;
     }
 
     @Override
-    public BackStackEntry getBackStackEntry(int index) {
+    public BackStackEntry getBackStackEntryAt(int index) {
         return mBackStack.get(index);
     }
 
@@ -1678,11 +1711,8 @@ final class FragmentManagerImpl extends FragmentManager {
             case FragmentTransaction.TRANSIT_FRAGMENT_CLOSE:
                 rev = FragmentTransaction.TRANSIT_FRAGMENT_OPEN;
                 break;
-            case FragmentTransaction.TRANSIT_FRAGMENT_NEXT:
-                rev = FragmentTransaction.TRANSIT_FRAGMENT_PREV;
-                break;
-            case FragmentTransaction.TRANSIT_FRAGMENT_PREV:
-                rev = FragmentTransaction.TRANSIT_FRAGMENT_NEXT;
+            case FragmentTransaction.TRANSIT_FRAGMENT_FADE:
+                rev = FragmentTransaction.TRANSIT_FRAGMENT_FADE;
                 break;
         }
         return rev;
@@ -1702,15 +1732,10 @@ final class FragmentManagerImpl extends FragmentManager {
                     ? com.android.internal.R.styleable.FragmentAnimation_fragmentCloseEnterAnimation
                     : com.android.internal.R.styleable.FragmentAnimation_fragmentCloseExitAnimation;
                 break;
-            case FragmentTransaction.TRANSIT_FRAGMENT_NEXT:
-                animAttr = enter
-                    ? com.android.internal.R.styleable.FragmentAnimation_fragmentNextEnterAnimation
-                    : com.android.internal.R.styleable.FragmentAnimation_fragmentNextExitAnimation;
-                break;
-            case FragmentTransaction.TRANSIT_FRAGMENT_PREV:
+            case FragmentTransaction.TRANSIT_FRAGMENT_FADE:
                 animAttr = enter
-                    ? com.android.internal.R.styleable.FragmentAnimation_fragmentPrevEnterAnimation
-                    : com.android.internal.R.styleable.FragmentAnimation_fragmentPrevExitAnimation;
+                    ? com.android.internal.R.styleable.FragmentAnimation_fragmentFadeEnterAnimation
+                    : com.android.internal.R.styleable.FragmentAnimation_fragmentFadeExitAnimation;
                 break;
         }
         return animAttr;
diff --git a/core/java/android/app/FragmentTransaction.java b/core/java/android/app/FragmentTransaction.java
index 1b8debc..fc59310 100644
--- a/core/java/android/app/FragmentTransaction.java
+++ b/core/java/android/app/FragmentTransaction.java
@@ -110,11 +110,16 @@ public abstract class FragmentTransaction {
     public static final int TRANSIT_FRAGMENT_OPEN = 1 | TRANSIT_ENTER_MASK;
     /** Fragment is being removed from the stack */
     public static final int TRANSIT_FRAGMENT_CLOSE = 2 | TRANSIT_EXIT_MASK;
-    /** Fragment is being added in a 'next' operation*/
-    public static final int TRANSIT_FRAGMENT_NEXT = 3 | TRANSIT_ENTER_MASK;
-    /** Fragment is being removed in a 'previous' operation */
-    public static final int TRANSIT_FRAGMENT_PREV = 4 | TRANSIT_EXIT_MASK;
+    /** Fragment should simply fade in or out; that is, no strong navigation associated
+     * with it except that it is appearing or disappearing for some reason. */
+    public static final int TRANSIT_FRAGMENT_FADE = 3 | TRANSIT_ENTER_MASK;
 
+    // Temp compat.
+    @Deprecated
+    public static final int TRANSIT_FRAGMENT_NEXT = TRANSIT_FRAGMENT_FADE;
+    @Deprecated
+    public static final int TRANSIT_FRAGMENT_PREV = TRANSIT_FRAGMENT_FADE;
+    
     /**
      * Set specific animation resources to run for the fragments that are
      * entering and exiting in this transaction.
diff --git a/core/java/android/app/LoaderManager.java b/core/java/android/app/LoaderManager.java
index cd5e3bb..ffe2a5d 100644
--- a/core/java/android/app/LoaderManager.java
+++ b/core/java/android/app/LoaderManager.java
@@ -159,14 +159,6 @@ public abstract class LoaderManager {
     public abstract void destroyLoader(int id);
 
     /**
-     * @deprecated Renamed to {@link #destroyLoader}.
-     */
-    @Deprecated
-    public void stopLoader(int id) {
-        destroyLoader(id);
-    }
-
-    /**
      * Return the Loader with the given id or null if no matching Loader
      * is found.
      */