summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-08-16 11:03:22 -0700
committerDianne Hackborn <hackbod@google.com>2012-08-16 12:46:49 -0700
commit77201b54149ff8d531eb15ac5bd8386b325974be (patch)
tree87aad105d2d7b12f78d4502e50d8650afa1c4cbf /samples
parentc225f65c5d26cae7e3da55be1c25da6c76c658eb (diff)
downloadandroid_development-77201b54149ff8d531eb15ac5bd8386b325974be.tar.gz
android_development-77201b54149ff8d531eb15ac5bd8386b325974be.tar.bz2
android_development-77201b54149ff8d531eb15ac5bd8386b325974be.zip
Rename UserId to UserHandle.
Change-Id: I701335483628d30c875d087f27287e084789f10c
Diffstat (limited to 'samples')
-rw-r--r--samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java6
-rw-r--r--samples/Support4Demos/src/com/example/android/supportv4/app/FragmentLayoutSupport.java6
2 files changed, 10 insertions, 2 deletions
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java b/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
index 730f4d44b..572173fb2 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
@@ -150,7 +150,11 @@ public class FragmentLayout extends Activity {
// Execute a transaction, replacing any existing fragment
// with this one inside the frame.
FragmentTransaction ft = getFragmentManager().beginTransaction();
- ft.replace(R.id.details, details);
+ if (index == 0) {
+ ft.replace(R.id.details, details);
+ } else {
+ ft.replace(R.id.a_item, details);
+ }
ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
ft.commit();
}
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentLayoutSupport.java b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentLayoutSupport.java
index 25ec4a3d3..8be83a6ba 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentLayoutSupport.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentLayoutSupport.java
@@ -153,7 +153,11 @@ public class FragmentLayoutSupport extends FragmentActivity {
// Execute a transaction, replacing any existing fragment
// with this one inside the frame.
FragmentTransaction ft = getFragmentManager().beginTransaction();
- ft.replace(R.id.details, details);
+ if (index == 0) {
+ ft.replace(R.id.details, details);
+ } else {
+ ft.replace(R.id.a_item, details);
+ }
ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
ft.commit();
}