summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/FragmentTransaction.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-01-17 14:38:50 -0800
committerDianne Hackborn <hackbod@google.com>2011-01-17 16:23:42 -0800
commit327fbd2c8fa294b919475feb4c74a74ee1981e02 (patch)
tree29cbf174cb8d501b1a52252f274fb33d650df3a4 /core/java/android/app/FragmentTransaction.java
parentf2bc4ee97f58ad7ea78da1f100dceed57c1484f1 (diff)
downloadframeworks_base-327fbd2c8fa294b919475feb4c74a74ee1981e02.zip
frameworks_base-327fbd2c8fa294b919475feb4c74a74ee1981e02.tar.gz
frameworks_base-327fbd2c8fa294b919475feb4c74a74ee1981e02.tar.bz2
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
Diffstat (limited to 'core/java/android/app/FragmentTransaction.java')
-rw-r--r--core/java/android/app/FragmentTransaction.java13
1 files changed, 9 insertions, 4 deletions
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.