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

Merge "Clean up LayoutTransition demos for smaller screens."

Browse Source
This commit is contained in:
Chet Haase
2011-10-06 14:32:35 -07:00
committed by Android (Google) Code Review
parent 69ad161520 976d6ceb73
commit b19c468208
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/ApiDemos/res/layout/layout_animations.xml
View File

@@ -40,34 +40,40 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
> >
<CheckBox <CheckBox
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checked="true" android:checked="true"
android:text="Appearing Animation" android:text="In"
android:id="@+id/appearingCB" android:id="@+id/appearingCB"
/> />
<CheckBox <CheckBox
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checked="true" android:checked="true"
android:text="Disappearing Animation" android:text="Out"
android:id="@+id/disappearingCB" android:id="@+id/disappearingCB"
/> />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<CheckBox <CheckBox
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checked="true" android:checked="true"
android:text="Changing/Appearing Animation" android:text="Changing-In"
android:id="@+id/changingAppearingCB" android:id="@+id/changingAppearingCB"
/> />
<CheckBox <CheckBox
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checked="true" android:checked="true"
android:text="Changing/Disappearing Animation" android:text="Changing-Out"
android:id="@+id/changingDisappearingCB" android:id="@+id/changingDisappearingCB"
/> />
</LinearLayout> </LinearLayout>

6
samples/ApiDemos/res/layout/layout_animations_hideshow.xml
View File

@@ -30,6 +30,12 @@
android:text="Show Buttons" android:text="Show Buttons"
android:id="@+id/addNewButton" android:id="@+id/addNewButton"
/> />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<CheckBox <CheckBox
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

7
samples/ApiDemos/src/com/example/android/apis/animation/LayoutAnimations.java
View File

@@ -20,7 +20,6 @@ package com.example.android.apis.animation;
// class is in a sub-package. // class is in a sub-package.
import android.animation.Animator; import android.animation.Animator;
import android.animation.ObjectAnimator; import android.animation.ObjectAnimator;
import android.widget.LinearLayout;
import com.example.android.apis.R; import com.example.android.apis.R;
import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorListenerAdapter;
@@ -59,8 +58,8 @@ public class LayoutAnimations extends Activity {
container = new FixedGridLayout(this); container = new FixedGridLayout(this);
container.setClipChildren(false); container.setClipChildren(false);
((FixedGridLayout)container).setCellHeight(50); ((FixedGridLayout)container).setCellHeight(90);
((FixedGridLayout)container).setCellWidth(200); ((FixedGridLayout)container).setCellWidth(100);
final LayoutTransition transitioner = new LayoutTransition(); final LayoutTransition transitioner = new LayoutTransition();
container.setLayoutTransition(transitioner); container.setLayoutTransition(transitioner);
defaultAppearingAnim = transitioner.getAnimator(LayoutTransition.APPEARING); defaultAppearingAnim = transitioner.getAnimator(LayoutTransition.APPEARING);
@@ -83,7 +82,7 @@ public class LayoutAnimations extends Activity {
addButton.setOnClickListener(new View.OnClickListener() { addButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
Button newButton = new Button(LayoutAnimations.this); Button newButton = new Button(LayoutAnimations.this);
newButton.setText("Click to Delete " + (numButtons++)); newButton.setText(String.valueOf(numButtons++));
newButton.setOnClickListener(new View.OnClickListener() { newButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
container.removeView(v); container.removeView(v);

4
samples/ApiDemos/src/com/example/android/apis/animation/LayoutAnimationsHideShow.java
View File

@@ -60,9 +60,9 @@ public class LayoutAnimationsHideShow extends Activity {
// Add a slew of buttons to the container. We won't add any more buttons at runtime, but // Add a slew of buttons to the container. We won't add any more buttons at runtime, but
// will just show/hide the buttons we've already created // will just show/hide the buttons we've already created
for (int i = 0; i < 6; ++i) { for (int i = 0; i < 4; ++i) {
Button newButton = new Button(this); Button newButton = new Button(this);
newButton.setText("Click to Hide " + i); newButton.setText(String.valueOf(i));
container.addView(newButton); container.addView(newButton);
newButton.setOnClickListener(new View.OnClickListener() { newButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {