From df98851d2fccc00d7bc9adfdf1088d34e007ae1a Mon Sep 17 00:00:00 2001
From: Jack Palevich <jackpal@google.com>
Date: Wed, 27 May 2009 17:00:45 -0700
Subject: [PATCH] Change the Fountain test app's package to
 com.android.fountain.

It had been com.android.calc, which caused conflicts with the real Calc
application.
---
 libs/rs/java/Fountain/AndroidManifest.xml                       | 2 +-
 libs/rs/java/Fountain/src/com/android/fountain/Fountain.java    | 2 +-
 .../rs/java/Fountain/src/com/android/fountain/FountainView.java | 2 +-
 .../java/Fountain/src/com/android/fountain/RSSurfaceView.java   | 2 +-
 .../rs/java/Fountain/src/com/android/fountain/RenderScript.java | 2 +-
 libs/rs/jni/RenderScript_jni.cpp                                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/rs/java/Fountain/AndroidManifest.xml b/libs/rs/java/Fountain/AndroidManifest.xml
index 62b0b0d1780d3..a10938bae863d 100644
--- a/libs/rs/java/Fountain/AndroidManifest.xml
+++ b/libs/rs/java/Fountain/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.calc">
+    package="com.android.fountain">
     <application android:label="Fountain">
         <activity android:name="Fountain"
                   android:theme="@android:style/Theme.Black.NoTitleBar">
diff --git a/libs/rs/java/Fountain/src/com/android/fountain/Fountain.java b/libs/rs/java/Fountain/src/com/android/fountain/Fountain.java
index ca0f02003ccc6..0d669660c84b0 100644
--- a/libs/rs/java/Fountain/src/com/android/fountain/Fountain.java
+++ b/libs/rs/java/Fountain/src/com/android/fountain/Fountain.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calc;
+package com.android.fountain;
 
 import android.app.Activity;
 import android.content.res.Configuration;
diff --git a/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java b/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java
index b6aa9f8bab1ba..eb848a570f237 100644
--- a/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java
+++ b/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calc;
+package com.android.fountain;
 
 import java.io.Writer;
 import java.util.ArrayList;
diff --git a/libs/rs/java/Fountain/src/com/android/fountain/RSSurfaceView.java b/libs/rs/java/Fountain/src/com/android/fountain/RSSurfaceView.java
index d18270a70b191..a8b3bca95f480 100644
--- a/libs/rs/java/Fountain/src/com/android/fountain/RSSurfaceView.java
+++ b/libs/rs/java/Fountain/src/com/android/fountain/RSSurfaceView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calc;
+package com.android.fountain;
 
 import java.io.Writer;
 import java.util.ArrayList;
diff --git a/libs/rs/java/Fountain/src/com/android/fountain/RenderScript.java b/libs/rs/java/Fountain/src/com/android/fountain/RenderScript.java
index ffde1a268b3f6..a62605377c18a 100644
--- a/libs/rs/java/Fountain/src/com/android/fountain/RenderScript.java
+++ b/libs/rs/java/Fountain/src/com/android/fountain/RenderScript.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calc;
+package com.android.fountain;
 
 import android.os.Bundle;
 import android.util.Log;
diff --git a/libs/rs/jni/RenderScript_jni.cpp b/libs/rs/jni/RenderScript_jni.cpp
index f3502e181f2ae..2a199c35aa7ef 100644
--- a/libs/rs/jni/RenderScript_jni.cpp
+++ b/libs/rs/jni/RenderScript_jni.cpp
@@ -934,7 +934,7 @@ nContextBindProgramFragment(JNIEnv *_env, jobject _this, jint pf)
 // ---------------------------------------------------------------------------
 
 
-static const char *classPathName = "com/android/calc/RenderScript";
+static const char *classPathName = "com/android/fountain/RenderScript";
 
 static JNINativeMethod methods[] = {
 {"_nInit",                         "()V",                                  (void*)_nInit },