Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55d45223 authored by Jack Palevich's avatar Jack Palevich
Browse files

Fix Fountain test app so that it actually builds.

Also check in first part of an libACC implementation.
parent ecd53112
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ LOCAL_SRC_FILES:= \

LOCAL_SHARED_LIBRARIES := \
	libandroid_runtime \
	libacc \
	libnativehelper \
	libRS \
	libcutils \
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ include $(CLEAR_VARS)

LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_PACKAGE_NAME := Calc
LOCAL_PACKAGE_NAME := Fountain

include $(BUILD_PACKAGE)
##################################################
+3 −3
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.android.calc">
    <application android:label="Calc">
        <activity android:name="Calc" 
    <application android:label="Fountain">
        <activity android:name="Fountain"
                  android:theme="@android:style/Theme.Black.NoTitleBar">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
+3 −3
Original line number Diff line number Diff line
@@ -34,14 +34,14 @@ import android.widget.ListView;

import java.lang.Runtime;

public class Calc extends Activity {
public class Fountain extends Activity {
    //EventListener mListener = new EventListener();

    private static final String LOG_TAG = "libRS_jni";
    private static final boolean DEBUG  = false;
    private static final boolean LOG_ENABLED = DEBUG ? Config.LOGD : Config.LOGV;

    private CalcView mView;
    private FountainView mView;

    // get the current looper (from your Activity UI thread for instance

@@ -53,7 +53,7 @@ public class Calc extends Activity {

        // Create our Preview view and set it as the content of our
        // Activity
        mView = new CalcView(this);
        mView = new FountainView(this);
        setContentView(mView);
    }

+16 −16
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ import android.view.SurfaceView;
import android.view.KeyEvent;
import android.view.MotionEvent;

public class CalcView extends RSSurfaceView {
public class FountainView extends RSSurfaceView {

    public CalcView(Context context) {
    public FountainView(Context context) {
        super(context);

        //setFocusable(true);
@@ -114,7 +114,7 @@ public class CalcView extends RSSurfaceView {
    @Override
    public boolean onTouchEvent(MotionEvent ev)
    {
        //Log.e("CalcView", ev.toString());
        //Log.e("FountainView", ev.toString());
        boolean ret = true;
        int act = ev.getAction();
        mParams[1] = (int)ev.getX();
Loading