From fe61687b97d55c92bb29bf6aae1288433229353d Mon Sep 17 00:00:00 2001 From: faketruth Date: Sat, 29 Sep 2012 13:41:47 +0000 Subject: Made beds placeable Android: Updated some stuff and set default view distance lower git-svn-id: http://mc-server.googlecode.com/svn/trunk@900 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- Android/gen/com/mcserver/R.java | 12 +++++---- Android/jni/Android.mk | 1 - Android/res/layout/main.xml | 37 ++++++++++++++++++-------- Android/res/values/strings.xml | 1 + Android/src/com/mcserver/MCServerActivity.java | 11 ++++++++ 5 files changed, 45 insertions(+), 17 deletions(-) (limited to 'Android') diff --git a/Android/gen/com/mcserver/R.java b/Android/gen/com/mcserver/R.java index db35f6b33..dd996a43f 100644 --- a/Android/gen/com/mcserver/R.java +++ b/Android/gen/com/mcserver/R.java @@ -14,11 +14,12 @@ public final class R { public static final int ic_launcher=0x7f020000; } public static final class id { - public static final int ip_address=0x7f050004; - public static final int listView1=0x7f050005; - public static final int server_status_text=0x7f050003; - public static final int start_server=0x7f050001; - public static final int stop_server=0x7f050002; + public static final int configure_server=0x7f050003; + public static final int ip_address=0x7f050005; + public static final int listView1=0x7f050006; + public static final int server_status_text=0x7f050004; + public static final int start_server=0x7f050002; + public static final int stop_server=0x7f050001; public static final int textView2=0x7f050000; } public static final class layout { @@ -27,6 +28,7 @@ public final class R { } public static final class string { public static final int app_name=0x7f040001; + public static final int configure=0x7f040007; public static final int hello=0x7f040000; public static final int mcserver_is_not_running=0x7f040005; public static final int mcserver_is_running=0x7f040004; diff --git a/Android/jni/Android.mk b/Android/jni/Android.mk index ae0123ba2..a9cb819c3 100644 --- a/Android/jni/Android.mk +++ b/Android/jni/Android.mk @@ -17,7 +17,6 @@ LOCAL_CFLAGS := -DANDROID_NDK \ -funroll-loops \ -mfloat-abi=softfp -mfpu=neon \ -fexceptions \ - -D_DEBUG \ LOCAL_STATIC_LIBRARIES := cpufeatures diff --git a/Android/res/layout/main.xml b/Android/res/layout/main.xml index dd5ee0e8f..1895e2752 100644 --- a/Android/res/layout/main.xml +++ b/Android/res/layout/main.xml @@ -11,19 +11,34 @@ android:layout_height="wrap_content" android:text="@string/app_name" android:textAppearance="?android:attr/textAppearanceLarge" /> - -