LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am ee6eedec: Merge "Undo inadvertent change to Transitions API demo."

Browse Source 
* commit 'ee6eedec15648d0897bade98f2d9a32b33f58058':
  Undo inadvertent change to Transitions API demo.
This commit is contained in:
George Mount
2014-03-13 12:37:23 -07:00
committed by Android Git Automerger
parent 933c03dfcf ee6eedec15
commit ccbda3b2fb
3 changed files with 36 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
samples/ApiDemos/res/layout/transition_scene1.xml
View File

@@ -18,40 +18,36 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/container"> android:id="@+id/container">
<TextView <View
android:layout_width="wrap_content" android:layout_width="100dip"
android:layout_height="wrap_content" android:layout_height="50dip"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="#f00" android:background="#f00"
android:text="Hello"
android:id="@+id/view1"/> android:id="@+id/view1"/>
<TextView <View
android:layout_width="wrap_content" android:layout_width="100dip"
android:layout_height="wrap_content" android:layout_height="50dip"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:background="#0f0" android:background="#0f0"
android:text="World"
android:id="@+id/view2"/> android:id="@+id/view2"/>
<TextView <View
android:layout_width="wrap_content" android:layout_width="100dip"
android:layout_height="wrap_content" android:layout_height="50dip"
android:background="#00f" android:background="#00f"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:text="Foo"
android:id="@+id/view3"/> android:id="@+id/view3"/>
<TextView <View
android:layout_width="wrap_content" android:layout_width="100dip"
android:layout_height="wrap_content" android:layout_height="50dip"
android:background="#0ff" android:background="#0ff"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:text="Bar"
android:id="@+id/view4"/> android:id="@+id/view4"/>
</RelativeLayout> </RelativeLayout>

28
samples/ApiDemos/res/layout/transition_scene2.xml
View File

@@ -18,40 +18,36 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/container"> android:id="@+id/container">
<TextView <View
android:layout_width="wrap_content" android:layout_width="100dip"
android:layout_height="wrap_content" android:layout_height="100dip"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:background="#f00" android:background="#f00"
android:text="Hello"
android:id="@+id/view1"/> android:id="@+id/view1"/>
<TextView <View
android:layout_width="wrap_content" android:layout_width="100dip"
android:layout_height="wrap_content" android:layout_height="100dip"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="#0f0" android:background="#0f0"
android:text="World"
android:id="@+id/view2"/> android:id="@+id/view2"/>
<TextView <View
android:layout_width="wrap_content" android:layout_width="100dip"
android:layout_height="wrap_content" android:layout_height="100dip"
android:background="#00f" android:background="#00f"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:text="Foo"
android:id="@+id/view3"/> android:id="@+id/view3"/>
<TextView <View
android:layout_width="wrap_content" android:layout_width="100dip"
android:layout_height="wrap_content" android:layout_height="100dip"
android:background="#0ff" android:background="#0ff"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:text="Bar"
android:id="@+id/view4"/> android:id="@+id/view4"/>
</RelativeLayout> </RelativeLayout>

28
samples/ApiDemos/res/layout/transition_scene3.xml
View File

@@ -18,40 +18,36 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/container"> android:id="@+id/container">
<TextView <View
android:layout_width="wrap_content" android:layout_width="100dip"
android:layout_height="wrap_content" android:layout_height="50dip"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="#f00" android:background="#f00"
android:text="Hello"
android:id="@+id/view1"/> android:id="@+id/view1"/>
<TextView <View
android:layout_width="wrap_content" android:layout_width="100dip"
android:layout_height="wrap_content" android:layout_height="50dip"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:background="#0f0" android:background="#0f0"
android:text="World"
android:id="@+id/view2"/> android:id="@+id/view2"/>
<TextView <View
android:layout_width="wrap_content" android:layout_width="100dip"
android:layout_height="wrap_content" android:layout_height="50dip"
android:background="#00f" android:background="#00f"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:text="Foo"
android:id="@+id/view3"/> android:id="@+id/view3"/>
<TextView <View
android:layout_width="wrap_content" android:layout_width="100dip"
android:layout_height="wrap_content" android:layout_height="50dip"
android:background="#0ff" android:background="#0ff"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:text="Bar"
android:id="@+id/view4"/> android:id="@+id/view4"/>
<LinearLayout <LinearLayout