summaryrefslogtreecommitdiffstats
path: root/tests/TransitionTests
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2013-04-18 14:18:35 -0700
committerChet Haase <chet@google.com>2013-04-18 14:18:35 -0700
commit797b7559d6d8d5dc7c1903f345162751a57560f6 (patch)
tree43079727d11ee170d310d8ca86396e282917f3bb /tests/TransitionTests
parent341a31b1072cda8b013cbadef6e75f9a771da326 (diff)
downloadframeworks_base-797b7559d6d8d5dc7c1903f345162751a57560f6.zip
frameworks_base-797b7559d6d8d5dc7c1903f345162751a57560f6.tar.gz
frameworks_base-797b7559d6d8d5dc7c1903f345162751a57560f6.tar.bz2
Fix build due to transition test errors
erroneous inclusion of R file for test files is causing build breakage on the server. Remove the offending lines. Change-Id: I1948facc1b5e3f8b7415e0e6c4290b53a54f12af
Diffstat (limited to 'tests/TransitionTests')
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/ChangingText.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/ClippingText.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/ContactsExpansion.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/CrossFadeDemo.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/Demo0.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/Demo1.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/Demo2.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/Demo3.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/Demo4.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/Demo5.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/FadingTest.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/HitRectBug.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/InstanceTargets.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/ListViewAddRemove.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/ListViewAddRemoveNoTransition.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/LoginActivity.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/LoginActivityFromResources.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/OverlayTest.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/Reparenting.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/ResourceLoadingTest.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTargets.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTransition.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTransition2.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/ScenesTestv21.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/SequenceTest.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/SequenceTestSimple.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/SurfaceAndTextureViews.java1
-rw-r--r--tests/TransitionTests/src/com/android/transitiontests/UniqueIds.java1
28 files changed, 0 insertions, 28 deletions
diff --git a/tests/TransitionTests/src/com/android/transitiontests/ChangingText.java b/tests/TransitionTests/src/com/android/transitiontests/ChangingText.java
index ed9b46a..3bb7100 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/ChangingText.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/ChangingText.java
@@ -26,7 +26,6 @@ import android.view.transition.Move;
import android.view.transition.TextChange;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class ChangingText extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/ClippingText.java b/tests/TransitionTests/src/com/android/transitiontests/ClippingText.java
index 0ecf1f4..c3201f2 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/ClippingText.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/ClippingText.java
@@ -26,7 +26,6 @@ import android.view.transition.Move;
import android.view.transition.TextChange;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class ClippingText extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/ContactsExpansion.java b/tests/TransitionTests/src/com/android/transitiontests/ContactsExpansion.java
index 55a96a5..c7da6a3 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/ContactsExpansion.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/ContactsExpansion.java
@@ -31,7 +31,6 @@ import android.view.transition.Move;
import android.view.transition.Rotate;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class ContactsExpansion extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/CrossFadeDemo.java b/tests/TransitionTests/src/com/android/transitiontests/CrossFadeDemo.java
index c428a73..2fcdc30 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/CrossFadeDemo.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/CrossFadeDemo.java
@@ -24,7 +24,6 @@ import android.view.transition.Move;
import android.view.transition.Scene;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class CrossFadeDemo extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/Demo0.java b/tests/TransitionTests/src/com/android/transitiontests/Demo0.java
index 55bf956..d52ab1d 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/Demo0.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/Demo0.java
@@ -21,7 +21,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import com.android.transitiontest.R;
public class Demo0 extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/Demo1.java b/tests/TransitionTests/src/com/android/transitiontests/Demo1.java
index 360a764..ce7f439 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/Demo1.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/Demo1.java
@@ -26,7 +26,6 @@ import android.view.transition.Move;
import android.view.transition.Scene;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class Demo1 extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/Demo2.java b/tests/TransitionTests/src/com/android/transitiontests/Demo2.java
index 40f8a08..7e1afab 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/Demo2.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/Demo2.java
@@ -26,7 +26,6 @@ import android.view.transition.Scene;
import android.view.transition.TransitionInflater;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class Demo2 extends Activity {
ViewGroup mSceneRoot;
diff --git a/tests/TransitionTests/src/com/android/transitiontests/Demo3.java b/tests/TransitionTests/src/com/android/transitiontests/Demo3.java
index f30f502..b8daff5 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/Demo3.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/Demo3.java
@@ -25,7 +25,6 @@ import android.view.transition.Recolor;
import android.view.transition.Scene;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class Demo3 extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/Demo4.java b/tests/TransitionTests/src/com/android/transitiontests/Demo4.java
index 41d6d08..8be54f5 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/Demo4.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/Demo4.java
@@ -25,7 +25,6 @@ import android.view.transition.Recolor;
import android.view.transition.Scene;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class Demo4 extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/Demo5.java b/tests/TransitionTests/src/com/android/transitiontests/Demo5.java
index 9d64f07..e64511e 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/Demo5.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/Demo5.java
@@ -21,7 +21,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.transition.Scene;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class Demo5 extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/FadingTest.java b/tests/TransitionTests/src/com/android/transitiontests/FadingTest.java
index 7d30dfd..400e994 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/FadingTest.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/FadingTest.java
@@ -23,7 +23,6 @@ import android.view.transition.Scene;
import android.widget.Button;
import android.view.transition.Fade;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class FadingTest extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/HitRectBug.java b/tests/TransitionTests/src/com/android/transitiontests/HitRectBug.java
index 33e00a8..9f19405 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/HitRectBug.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/HitRectBug.java
@@ -27,7 +27,6 @@ import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
import android.widget.RelativeLayout;
-import com.android.transitiontest.R;
public class HitRectBug extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/InstanceTargets.java b/tests/TransitionTests/src/com/android/transitiontests/InstanceTargets.java
index efccfa9..cf4ea9a 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/InstanceTargets.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/InstanceTargets.java
@@ -26,7 +26,6 @@ import android.view.transition.Scene;
import android.view.transition.TransitionManager;
import android.widget.Button;
import android.widget.RelativeLayout;
-import com.android.transitiontest.R;
import static android.widget.RelativeLayout.ALIGN_PARENT_LEFT;
import static android.widget.RelativeLayout.ALIGN_PARENT_RIGHT;
diff --git a/tests/TransitionTests/src/com/android/transitiontests/ListViewAddRemove.java b/tests/TransitionTests/src/com/android/transitiontests/ListViewAddRemove.java
index f0864dc..87ee874 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/ListViewAddRemove.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/ListViewAddRemove.java
@@ -32,7 +32,6 @@ import android.view.transition.Move;
import android.view.transition.Transition;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/tests/TransitionTests/src/com/android/transitiontests/ListViewAddRemoveNoTransition.java b/tests/TransitionTests/src/com/android/transitiontests/ListViewAddRemoveNoTransition.java
index 93d3d97..4eeba4d 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/ListViewAddRemoveNoTransition.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/ListViewAddRemoveNoTransition.java
@@ -24,7 +24,6 @@ import android.widget.ArrayAdapter;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
-import com.android.transitiontest.R;
import java.util.ArrayList;
diff --git a/tests/TransitionTests/src/com/android/transitiontests/LoginActivity.java b/tests/TransitionTests/src/com/android/transitiontests/LoginActivity.java
index d3c5174..06fa9f4 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/LoginActivity.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/LoginActivity.java
@@ -27,7 +27,6 @@ import android.view.transition.Slide;
import android.view.transition.Transition;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class LoginActivity extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/LoginActivityFromResources.java b/tests/TransitionTests/src/com/android/transitiontests/LoginActivityFromResources.java
index fc8aa9b..ff617aa 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/LoginActivityFromResources.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/LoginActivityFromResources.java
@@ -23,7 +23,6 @@ import android.view.transition.Scene;
import android.view.transition.TransitionInflater;
import android.widget.TextView;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class LoginActivityFromResources extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/OverlayTest.java b/tests/TransitionTests/src/com/android/transitiontests/OverlayTest.java
index 2f8224a..ef8cd37 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/OverlayTest.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/OverlayTest.java
@@ -20,7 +20,6 @@ import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
-import com.android.transitiontest.R;
public class OverlayTest extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/Reparenting.java b/tests/TransitionTests/src/com/android/transitiontests/Reparenting.java
index 8ee9d3f..e559c72 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/Reparenting.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/Reparenting.java
@@ -23,7 +23,6 @@ import android.view.transition.Move;
import android.view.transition.Scene;
import android.view.transition.TransitionManager;
import android.widget.Button;
-import com.android.transitiontest.R;
public class Reparenting extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/ResourceLoadingTest.java b/tests/TransitionTests/src/com/android/transitiontests/ResourceLoadingTest.java
index c05f898..3d7bd9b 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/ResourceLoadingTest.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/ResourceLoadingTest.java
@@ -23,7 +23,6 @@ import android.view.transition.Scene;
import android.view.transition.TransitionInflater;
import android.view.transition.Transition;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class ResourceLoadingTest extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTargets.java b/tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTargets.java
index ae8ee5b..374a9ab 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTargets.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTargets.java
@@ -26,7 +26,6 @@ import android.view.transition.Recolor;
import android.view.transition.Scene;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class ScenesTestAutoTargets extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTransition.java b/tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTransition.java
index 9184e87..fb1ba07 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTransition.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTransition.java
@@ -24,7 +24,6 @@ import android.view.transition.AutoTransition;
import android.view.transition.Scene;
import android.view.transition.Transition;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class ScenesTestAutoTransition extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTransition2.java b/tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTransition2.java
index fc8acc1..c75d419 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTransition2.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/ScenesTestAutoTransition2.java
@@ -22,7 +22,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.transition.Scene;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class ScenesTestAutoTransition2 extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/ScenesTestv21.java b/tests/TransitionTests/src/com/android/transitiontests/ScenesTestv21.java
index 2dae463..399c2be 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/ScenesTestv21.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/ScenesTestv21.java
@@ -26,7 +26,6 @@ import android.view.transition.Recolor;
import android.view.transition.Scene;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class ScenesTestv21 extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/SequenceTest.java b/tests/TransitionTests/src/com/android/transitiontests/SequenceTest.java
index 8cb6a1a..6b34420 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/SequenceTest.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/SequenceTest.java
@@ -26,7 +26,6 @@ import android.view.transition.Fade;
import android.view.transition.Move;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class SequenceTest extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/SequenceTestSimple.java b/tests/TransitionTests/src/com/android/transitiontests/SequenceTestSimple.java
index 93bfdb4..972d30e 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/SequenceTestSimple.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/SequenceTestSimple.java
@@ -26,7 +26,6 @@ import android.view.transition.Move;
import android.view.transition.Transition;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
public class SequenceTestSimple extends Activity {
diff --git a/tests/TransitionTests/src/com/android/transitiontests/SurfaceAndTextureViews.java b/tests/TransitionTests/src/com/android/transitiontests/SurfaceAndTextureViews.java
index f8829c9..aa76923 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/SurfaceAndTextureViews.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/SurfaceAndTextureViews.java
@@ -33,7 +33,6 @@ import android.view.transition.Scene;
import android.view.transition.TransitionGroup;
import android.view.transition.TransitionManager;
import android.widget.Button;
-import com.android.transitiontest.R;
import static android.widget.LinearLayout.LayoutParams;
diff --git a/tests/TransitionTests/src/com/android/transitiontests/UniqueIds.java b/tests/TransitionTests/src/com/android/transitiontests/UniqueIds.java
index 18537c7..433a91c 100644
--- a/tests/TransitionTests/src/com/android/transitiontests/UniqueIds.java
+++ b/tests/TransitionTests/src/com/android/transitiontests/UniqueIds.java
@@ -25,7 +25,6 @@ import android.view.transition.Transition;
import android.widget.Button;
import android.widget.LinearLayout;
import android.view.transition.TransitionManager;
-import com.android.transitiontest.R;
import java.util.HashMap;