summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2013-09-11 13:08:18 -0700
committerChet Haase <chet@google.com>2013-09-11 13:53:43 -0700
commitff58f92a0a77ad849ba714b5adac96790eca0048 (patch)
tree8afdc22ae95998fea49ba795f88e2338449e4ccd /tests
parent6847447da0b3e2e30e88838ec85244d1a0ee8927 (diff)
downloadframeworks_base-ff58f92a0a77ad849ba714b5adac96790eca0048.zip
frameworks_base-ff58f92a0a77ad849ba714b5adac96790eca0048.tar.gz
frameworks_base-ff58f92a0a77ad849ba714b5adac96790eca0048.tar.bz2
Add exclude() methods to Transition
It would be useful for a transition to declare not just which targets it wants to be run on, but also which targets it wants to avoid. For example, you may not want to animate the items of a ListView, or some other specific target in the view hierarchy. This change adds various exclude*() methods which make it possible to alter a transition to automatically ignore specific views, ids, or classes in the hierarchy. Issue #10692794 Transitions: Need API for excluding targets Change-Id: If38025cdbee537a545e5a4268cbbd763af4622c5
Diffstat (limited to 'tests')
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/ContactsExpansion.java4
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/CrossFadeDemo.java4
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/CrossfadeImage.java2
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/CrossfadeMultiple.java2
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/Demo1.java6
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/Demo2.java8
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/Demo4.java10
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/FadingTest.java4
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/InterruptionTest.java4
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/LoginActivity.java10
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/ScenesTestv21.java14
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/SequenceTest.java6
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/SequenceTestSimple.java8
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/SurfaceAndTextureViews.java4
14 files changed, 43 insertions, 43 deletions
diff --git a/tests/TransitionTests/src/com/android/transitiontests/ContactsExpansion.java b/tests/TransitionTests/src/com/android/transitiontests/ContactsExpansion.java
index 482dc05..f687da3 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/ContactsExpansion.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/ContactsExpansion.java
@@ -76,10 +76,10 @@ public class ContactsExpansion extends Activity {
final TransitionSet myTransition = new TransitionSet();
myTransition.addTransition(new Fade(Fade.IN)).
- addTransition(new Rotate().addTargetId(R.id.contact_arrow)).
+ addTransition(new Rotate().addTarget(R.id.contact_arrow)).
addTransition(new ChangeBounds()).
addTransition(new Fade(Fade.OUT)).
- addTransition(new Crossfade().addTargetId(R.id.contact_picture));
+ addTransition(new Crossfade().addTarget(R.id.contact_picture));
final ToggleScene toggleScene = new ToggleScene(container, myTransition);
contactItem.setOnClickListener(new View.OnClickListener() {
@Override
diff --git a/tests/TransitionTests/src/com/android/transitiontests/CrossFadeDemo.java b/tests/TransitionTests/src/com/android/transitiontests/CrossFadeDemo.java
index eb799ec..5bb0e77 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/CrossFadeDemo.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/CrossFadeDemo.java
@@ -47,8 +47,8 @@ public class CrossFadeDemo extends Activity {
Crossfade crossfade = new Crossfade();
crossfade.setFadeBehavior(Crossfade.FADE_BEHAVIOR_CROSSFADE);
crossfade.setResizeBehavior(Crossfade.RESIZE_BEHAVIOR_NONE);
- crossfade.addTargetId(R.id.textview).addTargetId(R.id.textview1).
- addTargetId(R.id.textview2);
+ crossfade.addTarget(R.id.textview).addTarget(R.id.textview1).
+ addTarget(R.id.textview2);
mTransitionManager = new TransitionManager();
TransitionSet moveCrossFade = new TransitionSet();
moveCrossFade.addTransition(crossfade).addTransition(new ChangeBounds());
diff --git a/tests/TransitionTests/src/com/android/transitiontests/CrossfadeImage.java b/tests/TransitionTests/src/com/android/transitiontests/CrossfadeImage.java
index 09b495f..1f278b9 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/CrossfadeImage.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/CrossfadeImage.java
@@ -48,7 +48,7 @@ public class CrossfadeImage extends Activity {
mImageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
Crossfade mCrossfade = new Crossfade();
- mCrossfade.addTargetId(R.id.contact_picture);
+ mCrossfade.addTarget(R.id.contact_picture);
TransitionSet group = new TransitionSet();
group.setDuration(1500);
diff --git a/tests/TransitionTests/src/com/android/transitiontests/CrossfadeMultiple.java b/tests/TransitionTests/src/com/android/transitiontests/CrossfadeMultiple.java
index c118398..d784f75 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/CrossfadeMultiple.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/CrossfadeMultiple.java
@@ -57,7 +57,7 @@ public class CrossfadeMultiple extends Activity {
mTextView = (TextView) findViewById(R.id.textview);
mCrossfade = new Crossfade();
- mCrossfade.addTargetId(R.id.button).addTargetId(R.id.textview).addTargetId(R.id.imageview);
+ mCrossfade.addTarget(R.id.button).addTarget(R.id.textview).addTarget(R.id.imageview);
mCrossfadeGroup = new TransitionSet();
mCrossfadeGroup.setDuration(300);
diff --git a/tests/TransitionTests/src/com/android/transitiontests/Demo1.java b/tests/TransitionTests/src/com/android/transitiontests/Demo1.java
index 5c0cd45..5b5eb15 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/Demo1.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/Demo1.java
@@ -70,9 +70,9 @@ public class Demo1 extends Activity {
if (mFirstTime) {
mFirstTime = false;
TransitionSet transition = new TransitionSet();
- transition.addTransition(new Fade().addTargetId(R.id.resultsText).
- addTargetId(R.id.resultsList)).
- addTransition(new ChangeBounds().addTargetId(R.id.searchContainer));
+ transition.addTransition(new Fade().addTarget(R.id.resultsText).
+ addTarget(R.id.resultsList)).
+ addTransition(new ChangeBounds().addTarget(R.id.searchContainer));
mTransitionManager = new TransitionManager();
mTransitionManager.setTransition(mSearchScreen, transition);
mTransitionManager.setTransition(mResultsScreen, transition);
diff --git a/tests/TransitionTests/src/com/android/transitiontests/Demo2.java b/tests/TransitionTests/src/com/android/transitiontests/Demo2.java
index 334b777..0f3257b 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/Demo2.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/Demo2.java
@@ -57,10 +57,10 @@ public class Demo2 extends Activity {
}
TransitionSet transition = new TransitionSet();
- transition.addTransition(new Fade().addTargetId(R.id.resultsText).
- addTargetId(R.id.resultsList)).
- addTransition(new ChangeBounds().addTargetId(R.id.searchContainer)).
- addTransition(new Recolor().addTargetId(R.id.container));
+ transition.addTransition(new Fade().addTarget(R.id.resultsText).
+ addTarget(R.id.resultsList)).
+ addTransition(new ChangeBounds().addTarget(R.id.searchContainer)).
+ addTransition(new Recolor().addTarget(R.id.container));
mTransitionManager = new TransitionManager();
mTransitionManager.setTransition(mSearchScreen, transition);
mTransitionManager.setTransition(mResultsScreen, transition);
diff --git a/tests/TransitionTests/src/com/android/transitiontests/Demo4.java b/tests/TransitionTests/src/com/android/transitiontests/Demo4.java
index d1c3358..3aadbb0 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/Demo4.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/Demo4.java
@@ -46,17 +46,17 @@ public class Demo4 extends Activity {
TransitionSet transitionToResults = new TransitionSet();
Fade fade = new Fade();
- fade.addTargetId(R.id.resultsText).addTargetId(R.id.resultsList);
+ fade.addTarget(R.id.resultsText).addTarget(R.id.resultsList);
fade.setStartDelay(300);
fade.setDuration(1000);
transitionToResults.addTransition(fade).
- addTransition(new ChangeBounds().addTargetId(R.id.searchContainer)).
- addTransition(new Recolor().addTargetId(R.id.container));
+ addTransition(new ChangeBounds().addTarget(R.id.searchContainer)).
+ addTransition(new Recolor().addTarget(R.id.container));
TransitionSet transitionToSearch = new TransitionSet();
transitionToSearch.addTransition(fade).
- addTransition(new ChangeBounds().addTargetId(R.id.searchContainer)).
- addTransition(new Recolor().addTargetId(R.id.container));
+ addTransition(new ChangeBounds().addTarget(R.id.searchContainer)).
+ addTransition(new Recolor().addTarget(R.id.container));
mTransitionManager = new TransitionManager();
mTransitionManager.setTransition(mSearchScreen, transitionToSearch);
diff --git a/tests/TransitionTests/src/com/android/transitiontests/FadingTest.java b/tests/TransitionTests/src/com/android/transitiontests/FadingTest.java
index 000ea9b..29fb868 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/FadingTest.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/FadingTest.java
@@ -34,8 +34,8 @@ public class FadingTest extends Activity {
Scene mCurrentScene;
static {
- sFade.addTargetId(R.id.removingButton).addTargetId(R.id.invisibleButton).
- addTargetId(R.id.goneButton);
+ sFade.addTarget(R.id.removingButton).addTarget(R.id.invisibleButton).
+ addTarget(R.id.goneButton);
}
@Override
diff --git a/tests/TransitionTests/src/com/android/transitiontests/InterruptionTest.java b/tests/TransitionTests/src/com/android/transitiontests/InterruptionTest.java
index 70257bb..c26e93f 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/InterruptionTest.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/InterruptionTest.java
@@ -53,9 +53,9 @@ public class InterruptionTest extends Activity {
mScene4RB = (RadioButton) findViewById(R.id.scene4RB);
ChangeBounds changeBounds1 = new ChangeBounds();
- changeBounds1.addTargetId(R.id.button);
+ changeBounds1.addTarget(R.id.button);
ChangeBounds changeBounds2 = new ChangeBounds();
- changeBounds2.addTargetId(R.id.button1);
+ changeBounds2.addTarget(R.id.button1);
mSequencedMove.addTransition(changeBounds1).addTransition(changeBounds2);
mSequencedMove.setDuration(1000);
diff --git a/tests/TransitionTests/src/com/android/transitiontests/LoginActivity.java b/tests/TransitionTests/src/com/android/transitiontests/LoginActivity.java
index 34ec6cc..92bbb85 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/LoginActivity.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/LoginActivity.java
@@ -54,9 +54,9 @@ public class LoginActivity extends Activity {
// Custom transitions in/out of NewUser screen - slide in the 2nd password UI
TransitionSet slider = new TransitionSet();
- slider.addTransition(new Slide().addTargetId(R.id.retype).addTargetId(R.id.retypeEdit));
- slider.addTransition(new Recolor().addTargetId(R.id.password).
- addTargetId(R.id.passwordEdit));
+ slider.addTransition(new Slide().addTarget(R.id.retype).addTarget(R.id.retypeEdit));
+ slider.addTransition(new Recolor().addTarget(R.id.password).
+ addTarget(R.id.passwordEdit));
slider.addTransition(new Fade());
mTransitionManager.setTransition(mLoginScene, mNewUserScene, slider);
mTransitionManager.setTransition(mPasswordScene, mNewUserScene, slider);
@@ -64,8 +64,8 @@ public class LoginActivity extends Activity {
mTransitionManager.setTransition(mNewUserScene, mPasswordScene, slider);
// Custom transitions with recoloring password field
- Transition colorizer = new Recolor().addTargetId(R.id.password).
- addTargetId(R.id.passwordEdit);
+ Transition colorizer = new Recolor().addTarget(R.id.password).
+ addTarget(R.id.passwordEdit);
mTransitionManager.setTransition(mLoginScene, mPasswordScene, colorizer);
mTransitionManager.setTransition(mPasswordScene, mLoginScene, colorizer);
diff --git a/tests/TransitionTests/src/com/android/transitiontests/ScenesTestv21.java b/tests/TransitionTests/src/com/android/transitiontests/ScenesTestv21.java
index c6011f2..ecf5ef3 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/ScenesTestv21.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/ScenesTestv21.java
@@ -47,17 +47,17 @@ public class ScenesTestv21 extends Activity {
TransitionSet transitionToResults = new TransitionSet();
Fade fade = new Fade();
- fade.addTargetId(R.id.resultsText).addTargetId(R.id.resultsList);
+ fade.addTarget(R.id.resultsText).addTarget(R.id.resultsList);
fade.setStartDelay(300);
transitionToResults.addTransition(fade);
- transitionToResults.addTransition(new ChangeBounds().addTargetId(R.id.searchContainer));
- transitionToResults.addTransition(new Recolor().addTargetId(R.id.container));
+ transitionToResults.addTransition(new ChangeBounds().addTarget(R.id.searchContainer));
+ transitionToResults.addTransition(new Recolor().addTarget(R.id.container));
TransitionSet transitionToSearch = new TransitionSet();
- transitionToSearch.addTransition(new Fade().addTargetId(R.id.resultsText).
- addTargetId(R.id.resultsList));
- transitionToSearch.addTransition(new ChangeBounds().addTargetId(R.id.searchContainer));
- transitionToSearch.addTransition(new Recolor().addTargetId(R.id.container));
+ transitionToSearch.addTransition(new Fade().addTarget(R.id.resultsText).
+ addTarget(R.id.resultsList));
+ transitionToSearch.addTransition(new ChangeBounds().addTarget(R.id.searchContainer));
+ transitionToSearch.addTransition(new Recolor().addTarget(R.id.container));
mTransitionManager = new TransitionManager();
mTransitionManager.setTransition(mSearchScreen, transitionToSearch);
mTransitionManager.setTransition(mResultsScreen, transitionToResults);
diff --git a/tests/TransitionTests/src/com/android/transitiontests/SequenceTest.java b/tests/TransitionTests/src/com/android/transitiontests/SequenceTest.java
index ab1dc26..c550e92 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/SequenceTest.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/SequenceTest.java
@@ -51,9 +51,9 @@ public class SequenceTest extends Activity {
mScene1 = Scene.getSceneForLayout(mSceneRoot, R.layout.fading_test, this);
mScene2 = Scene.getSceneForLayout(mSceneRoot, R.layout.fading_test_scene_2, this);
- Transition fade1 = new Fade().addTargetId(R.id.removingButton);
- Transition fade2 = new Fade().addTargetId(R.id.invisibleButton);
- Transition fade3 = new Fade().addTargetId(R.id.goneButton);
+ Transition fade1 = new Fade().addTarget(R.id.removingButton);
+ Transition fade2 = new Fade().addTarget(R.id.invisibleButton);
+ Transition fade3 = new Fade().addTarget(R.id.goneButton);
TransitionSet fader = new TransitionSet().
setOrdering(TransitionSet.ORDERING_SEQUENTIAL);
fader.addTransition(fade1).addTransition(fade2).addTransition(fade3).
diff --git a/tests/TransitionTests/src/com/android/transitiontests/SequenceTestSimple.java b/tests/TransitionTests/src/com/android/transitiontests/SequenceTestSimple.java
index 52c21c9..92b169e 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/SequenceTestSimple.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/SequenceTestSimple.java
@@ -52,14 +52,14 @@ public class SequenceTestSimple extends Activity {
TransitionSet fader = new TransitionSet().
setOrdering(TransitionSet.ORDERING_SEQUENTIAL);
- fader.addTransition(new Fade().addTargetId(R.id.removingButton));
- fader.addTransition(new ChangeBounds().addTargetId(R.id.sceneSwitchButton));
+ fader.addTransition(new Fade().addTarget(R.id.removingButton));
+ fader.addTransition(new ChangeBounds().addTarget(R.id.sceneSwitchButton));
sequencedFade = fader;
sequencedFadeReverse = new TransitionSet().
setOrdering(TransitionSet.ORDERING_SEQUENTIAL);
- sequencedFadeReverse.addTransition(new ChangeBounds().addTargetId(R.id.sceneSwitchButton));
- sequencedFadeReverse.addTransition(new Fade().addTargetId(R.id.removingButton));
+ sequencedFadeReverse.addTransition(new ChangeBounds().addTarget(R.id.sceneSwitchButton));
+ sequencedFadeReverse.addTransition(new Fade().addTarget(R.id.removingButton));
mCurrentScene = mScene1;
}
diff --git a/tests/TransitionTests/src/com/android/transitiontests/SurfaceAndTextureViews.java b/tests/TransitionTests/src/com/android/transitiontests/SurfaceAndTextureViews.java
index 05af044..9b246ad 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/SurfaceAndTextureViews.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/SurfaceAndTextureViews.java
@@ -67,8 +67,8 @@ public class SurfaceAndTextureViews extends Activity {
container.addView(mTextureView);
final TransitionSet transition = new TransitionSet();
- transition.addTransition(new ChangeBounds()).addTransition(new Crossfade().addTargetId(0).
- addTargetId(1).addTargetId(2));
+ transition.addTransition(new ChangeBounds()).addTransition(new Crossfade().addTarget(0).
+ addTarget(1).addTarget(2));
toggleButton.setOnClickListener(new View.OnClickListener() {
@Override
generated by cgit v1.1 at 2025-03-29 00:30:54 +0000