Renaming some classes to clarify what is what.

Change-Id: Iaee63ffd96bc269e46bc052d333ba1a5e848bd13

5 files changed, 13 insertions, 13 deletions

diff --git a/tests/RenderScriptTests/SceneGraph/AndroidManifest.xml b/tests/RenderScriptTests/SceneGraph/AndroidManifest.xml
index 4de8c2999e6a..7017d5a7b46d 100644
--- a/tests/RenderScriptTests/SceneGraph/AndroidManifest.xml
+++ b/tests/RenderScriptTests/SceneGraph/AndroidManifest.xml
@@ -4,7 +4,7 @@
     <uses-permission
         android:name="android.permission.INTERNET" />
     <application android:label="SceneGraphTest">
-        <activity android:name="SceneGraph"
+        <activity android:name="TestApp"
                   android:label="SceneGraphTest">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/ColladaScene.java b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/ColladaScene.java
index 9394b66fc14a..3b4efa67e2ec 100644
--- a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/ColladaScene.java
+++ b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/ColladaScene.java
@@ -49,10 +49,10 @@ public class ColladaScene {
     private final boolean mLoadFromSD = true;
     private static String mSDCardPath = "sdcard/scenegraph/";
 
-    SceneGraphRS mRenderer;
+    TestAppRS mRenderer;
     SceneLoadedCallback mCallback;
 
-    public ColladaScene(String name, SceneGraphRS renderer) {
+    public ColladaScene(String name, TestAppRS renderer) {
         modelName = name;
         mRenderer = renderer;
     }
diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/SceneGraph.java b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TestApp.java
index cfb91f4eba88..ccdd2aa40ef6 100644
--- a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/SceneGraph.java
+++ b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TestApp.java
@@ -40,9 +40,9 @@ import android.net.Uri;
 
 import java.lang.Runtime;
 
-public class SceneGraph extends Activity {
+public class TestApp extends Activity {
 
-    private SceneGraphView mView;
+    private TestAppView mView;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -50,7 +50,7 @@ public class SceneGraph extends Activity {
 
         // Create our Preview view and set it as the content of our
         // Activity
-        mView = new SceneGraphView(this);
+        mView = new TestAppView(this);
         setContentView(mView);
     }
 
diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/SceneGraphRS.java b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TestAppRS.java
index 04b4cd894a5a..c0a3b75cff40 100644
--- a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/SceneGraphRS.java
+++ b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TestAppRS.java
@@ -41,10 +41,10 @@ import android.util.Log;
 
 import com.android.scenegraph.SceneManager.SceneLoadedCallback;
 
-public class SceneGraphRS {
+public class TestAppRS {
 
     private static String modelName = "orientation_test";
-    private static String TAG = "SceneGraphRS";
+    private static String TAG = "TestAppRS";
     private final int STATE_LAST_FOCUS = 1;
     private final boolean mLoadFromSD = true;
     private static String mSDCardPath = "sdcard/scenegraph/";
@@ -65,7 +65,7 @@ public class SceneGraphRS {
 
     TouchHandler mTouchHandler;
 
-    public SceneGraphRS() {
+    public TestAppRS() {
         mUseBlur = false;
     }
 
diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/SceneGraphView.java b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TestAppView.java
index 0f2850176f88..cefa3e651860 100644
--- a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/SceneGraphView.java
+++ b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TestAppView.java
@@ -40,15 +40,15 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 
-public class SceneGraphView extends RSSurfaceView {
+public class TestAppView extends RSSurfaceView {
 
-    public SceneGraphView(Context context) {
+    public TestAppView(Context context) {
         super(context);
         mScaleDetector = new ScaleGestureDetector(context, new ScaleListener());
     }
 
     private RenderScriptGL mRS;
-    SceneGraphRS mRender;
+    TestAppRS mRender;
 
     private ScaleGestureDetector mScaleDetector;
     private static final int INVALID_POINTER_ID = -1;
@@ -61,7 +61,7 @@ public class SceneGraphView extends RSSurfaceView {
             sc.setDepth(16, 24);
             mRS = createRenderScriptGL(sc);
             mRS.setSurface(holder, w, h);
-            mRender = new SceneGraphRS();
+            mRender = new TestAppRS();
             mRender.init(mRS, getResources(), w, h);
         }
     }