From 5aec62eae12b35de8d5fe7cba29166048c167572 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Fri, 8 May 2015 14:21:20 -0700
Subject: [PATCH] Remove hidden/deleted APIs.

Change-Id: Iabeaac2c9b485f1f25fb2fcc3193610b0d6478c4
---
 core/java/android/app/BackStackRecord.java    | 40 -------------------
 .../app/EnterTransitionCoordinator.java       |  2 +-
 .../java/android/app/FragmentTransaction.java | 20 ----------
 core/java/android/view/Window.java            | 14 -------
 4 files changed, 1 insertion(+), 75 deletions(-)

diff --git a/core/java/android/app/BackStackRecord.java b/core/java/android/app/BackStackRecord.java
index 49644a789d574..1fb88a9400903 100644
--- a/core/java/android/app/BackStackRecord.java
+++ b/core/java/android/app/BackStackRecord.java
@@ -577,46 +577,6 @@ final class BackStackRecord extends FragmentTransaction implements
         return this;
     }
 
-    /** TODO: remove this */
-    @Override
-    public FragmentTransaction setSharedElement(View sharedElement, String name) {
-        String transitionName = sharedElement.getTransitionName();
-        if (transitionName == null) {
-            throw new IllegalArgumentException("Unique transitionNames are required for all" +
-                    " sharedElements");
-        }
-        mSharedElementSourceNames = new ArrayList<String>(1);
-        mSharedElementSourceNames.add(transitionName);
-
-        mSharedElementTargetNames = new ArrayList<String>(1);
-        mSharedElementTargetNames.add(name);
-        return this;
-    }
-
-    /** TODO: remove this */
-    @Override
-    public FragmentTransaction setSharedElements(Pair<View, String>... sharedElements) {
-        if (sharedElements == null || sharedElements.length == 0) {
-            mSharedElementSourceNames = null;
-            mSharedElementTargetNames = null;
-        } else {
-            ArrayList<String> sourceNames = new ArrayList<String>(sharedElements.length);
-            ArrayList<String> targetNames = new ArrayList<String>(sharedElements.length);
-            for (int i = 0; i < sharedElements.length; i++) {
-                String transitionName = sharedElements[i].first.getTransitionName();
-                if (transitionName == null) {
-                    throw new IllegalArgumentException("Unique transitionNames are required for all"
-                            + " sharedElements");
-                }
-                sourceNames.add(transitionName);
-                targetNames.add(sharedElements[i].second);
-            }
-            mSharedElementSourceNames = sourceNames;
-            mSharedElementTargetNames = targetNames;
-        }
-        return this;
-    }
-
     public FragmentTransaction setTransitionStyle(int styleRes) {
         mTransitionStyle = styleRes;
         return this;
diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index e84a8dabf3b7d..f65326e5aad3c 100644
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -604,7 +604,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
     }
 
     private boolean allowOverlappingTransitions() {
-        return mIsReturning ? getWindow().getAllowExitTransitionOverlap()
+        return mIsReturning ? getWindow().getAllowReturnTransitionOverlap()
                 : getWindow().getAllowEnterTransitionOverlap();
     }
 
diff --git a/core/java/android/app/FragmentTransaction.java b/core/java/android/app/FragmentTransaction.java
index dc7075c7e0a66..876c0f669f2dd 100644
--- a/core/java/android/app/FragmentTransaction.java
+++ b/core/java/android/app/FragmentTransaction.java
@@ -171,14 +171,6 @@ public abstract class FragmentTransaction {
      */
     public abstract FragmentTransaction setTransition(int transit);
 
-    /**
-     * TODO: remove from API
-     * @hide
-     */
-    public FragmentTransaction setCustomTransition(int sceneRootId, int transitionId) {
-        return this;
-    }
-
     /**
      * Used with to map a View from a removed or hidden Fragment to a View from a shown
      * or added Fragment.
@@ -189,18 +181,6 @@ public abstract class FragmentTransaction {
      */
     public abstract FragmentTransaction addSharedElement(View sharedElement, String name);
 
-    /**
-     * TODO: remove from API
-     * @hide
-     */
-    public abstract FragmentTransaction setSharedElement(View sharedElement, String name);
-
-    /**
-     * TODO: remove from API
-     * @hide
-     */
-    public abstract FragmentTransaction setSharedElements(Pair<View, String>... sharedElements);
-
     /**
      * Set a custom style resource that will be used for resolving transit
      * animations.
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 49a72cefb794f..07984e9ddd982 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -1783,14 +1783,6 @@ public abstract class Window {
      */
     public void setAllowReturnTransitionOverlap(boolean allow) {}
 
-    /**
-     * TODO: remove this.
-     * @hide
-     */
-    public void setAllowExitTransitionOverlap(boolean allow) {
-        setAllowReturnTransitionOverlap(allow);
-    }
-
     /**
      * Returns how the transition set in
      * {@link #setExitTransition(android.transition.Transition)} overlaps with the exit
@@ -1804,12 +1796,6 @@ public abstract class Window {
      */
     public boolean getAllowReturnTransitionOverlap() { return true; }
 
-    /**
-     * TODO: remove this.
-     * @hide
-     */
-    public boolean getAllowExitTransitionOverlap() { return getAllowReturnTransitionOverlap(); }
-
     /**
      * Returns the duration, in milliseconds, of the window background fade
      * when transitioning into or away from an Activity when called with an Activity Transition.