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.
This commit is contained in:
@@ -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">
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.calc;
|
||||
package com.android.fountain;
|
||||
|
||||
import java.io.Writer;
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.calc;
|
||||
package com.android.fountain;
|
||||
|
||||
import java.io.Writer;
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.calc;
|
||||
package com.android.fountain;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
|
||||
@@ -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 },
|
||||
|
||||
Reference in New Issue
Block a user