Merge "API Review: change fragment transition methods." into lmp-dev

2 files changed, 26 insertions, 5 deletions

diff --git a/core/java/android/app/BackStackRecord.java b/core/java/android/app/BackStackRecord.java
index 4433a3a..67863a5 100644
--- a/core/java/android/app/BackStackRecord.java
+++ b/core/java/android/app/BackStackRecord.java
@@ -580,6 +580,23 @@ final class BackStackRecord extends FragmentTransaction implements
     }
 
     @Override
+    public FragmentTransaction addSharedElement(View sharedElement, String name) {
+        String transitionName = sharedElement.getTransitionName();
+        if (transitionName == null) {
+            throw new IllegalArgumentException("Unique transitionNames are required for all" +
+                    " sharedElements");
+        }
+        if (mSharedElementSourceNames == null) {
+            mSharedElementSourceNames = new ArrayList<String>();
+            mSharedElementTargetNames = new ArrayList<String>();
+        }
+        mSharedElementSourceNames.add(transitionName);
+        mSharedElementTargetNames.add(name);
+        return this;
+    }
+
+    /** TODO: remove this */
+    @Override
     public FragmentTransaction setSharedElement(View sharedElement, String name) {
         String transitionName = sharedElement.getTransitionName();
         if (transitionName == null) {
@@ -594,6 +611,7 @@ final class BackStackRecord extends FragmentTransaction implements
         return this;
     }
 
+    /** TODO: remove this */
     @Override
     public FragmentTransaction setSharedElements(Pair<View, String>... sharedElements) {
         if (sharedElements == null || sharedElements.length == 0) {
diff --git a/core/java/android/app/FragmentTransaction.java b/core/java/android/app/FragmentTransaction.java
index 0adc835..1077bac 100644
--- a/core/java/android/app/FragmentTransaction.java
+++ b/core/java/android/app/FragmentTransaction.java
@@ -190,14 +190,17 @@ public abstract class FragmentTransaction {
      * @param name The transitionName for a View in an appearing Fragment to match to the shared
      *             element.
      */
+    public abstract FragmentTransaction addSharedElement(View sharedElement, String name);
+
+    /**
+     * TODO: remove from API
+     * @hide
+     */
     public abstract FragmentTransaction setSharedElement(View sharedElement, String name);
 
     /**
-     * Used with {@link #setCustomTransition(int, int)} to map multiple Views from removed or hidden
-     * Fragments to a Views from a shown or added Fragments. Views in
-     * <var>sharedElements</var> must have unique transitionNames in the View hierarchy.
-     * @param sharedElements Pairs of Views in disappearing Fragments to transitionNames in
-     *                       appearing Fragments.
+     * TODO: remove from API
+     * @hide
      */
     public abstract FragmentTransaction setSharedElements(Pair<View, String>... sharedElements);