summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/FragmentTransaction.java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2015-05-15 14:08:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-15 14:08:19 +0000
commitb1f1293355a1837d95095d28891f9218bdcf2bdd (patch)
tree96dab6aad603d924e11e8f9696299c9bb10fa483 /core/java/android/app/FragmentTransaction.java
parentd63f9321e62064660d426efd5abbd885c4a24652 (diff)
parent5aec62eae12b35de8d5fe7cba29166048c167572 (diff)
downloadframeworks_base-b1f1293355a1837d95095d28891f9218bdcf2bdd.zip
frameworks_base-b1f1293355a1837d95095d28891f9218bdcf2bdd.tar.gz
frameworks_base-b1f1293355a1837d95095d28891f9218bdcf2bdd.tar.bz2
Merge "Remove hidden/deleted APIs." into mnc-dev
Diffstat (limited to 'core/java/android/app/FragmentTransaction.java')
-rw-r--r--core/java/android/app/FragmentTransaction.java20
1 files changed, 0 insertions, 20 deletions
diff --git a/core/java/android/app/FragmentTransaction.java b/core/java/android/app/FragmentTransaction.java
index dc7075c..876c0f6 100644
--- a/core/java/android/app/FragmentTransaction.java
+++ b/core/java/android/app/FragmentTransaction.java
@@ -172,14 +172,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.
* @param sharedElement A View in a disappearing Fragment to match with a View in an
@@ -190,18 +182,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.
*/