Play nice with Project Ara's Android.
- Add Android.mk.
- Various styles.xml changes to get it to build at our API level.
- Move the package name to avoid potential conflicts with the other
pulse ox app.
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..f97d74d
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,12 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_STATIC_JAVA_LIBRARIES := archartengine
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_PACKAGE_NAME := AraPulseOx
+include $(BUILD_PACKAGE)
+
+include $(CLEAR_VARS)
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := archartengine:libs/achartengine-1.1.0.jar
+include $(BUILD_MULTI_PREBUILT)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 77afc10..b35549b 100644
--- a/AndroidManifest.xml
+++ b/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.google.araplox"
+ package="com.google.araploxio"
android:versionCode="1"
android:versionName="1.0" >
@@ -14,7 +14,7 @@
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
- android:name="com.google.araplox.AraPloxActivity"
+ android:name="com.google.araploxio.AraPloxActivity"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/res/menu/ara_plox.xml b/res/menu/ara_plox.xml
index 44d8766..dc339fd 100644
--- a/res/menu/ara_plox.xml
+++ b/res/menu/ara_plox.xml
@@ -1,5 +1,5 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- tools:context="com.google.araplox.AraPloxActivity" >
+ tools:context="com.google.araploxio.AraPloxActivity" >
</menu>
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
index a4a95bc..3c02242 100644
--- a/res/values-v11/styles.xml
+++ b/res/values-v11/styles.xml
@@ -4,7 +4,7 @@
Base application theme for API 11+. This theme completely replaces
AppBaseTheme from res/values/styles.xml on API 11+ devices.
-->
- <style name="AppBaseTheme" parent="Theme.AppCompat.Light">
+ <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
<!-- API 11 theme customizations can go here. -->
</style>
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
index 664f4f1..a91fd03 100644
--- a/res/values-v14/styles.xml
+++ b/res/values-v14/styles.xml
@@ -5,7 +5,7 @@
AppBaseTheme from BOTH res/values/styles.xml and
res/values-v11/styles.xml on API 14+ devices.
-->
- <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+ <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<!-- API 14 theme customizations can go here. -->
</style>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 845fb57..6ce89c7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -4,7 +4,7 @@
Base application theme, dependent on API level. This theme is replaced
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-->
- <style name="AppBaseTheme" parent="Theme.AppCompat.Light">
+ <style name="AppBaseTheme" parent="android:Theme.Light">
<!--
Theme customizations available in newer API levels can go in
res/values-vXX/styles.xml, while customizations related to
diff --git a/src/com/google/araplox/AFE4400Thread.java b/src/com/google/araploxio/AFE4400Thread.java
similarity index 97%
rename from src/com/google/araplox/AFE4400Thread.java
rename to src/com/google/araploxio/AFE4400Thread.java
index 7bffe32..3f004fa 100644
--- a/src/com/google/araplox/AFE4400Thread.java
+++ b/src/com/google/araploxio/AFE4400Thread.java
@@ -1,4 +1,4 @@
-package com.google.araplox;
+package com.google.araploxio;
import java.io.DataInputStream;
import java.io.IOException;
diff --git a/src/com/google/araplox/AraPloxActivity.java b/src/com/google/araploxio/AraPloxActivity.java
similarity index 98%
rename from src/com/google/araplox/AraPloxActivity.java
rename to src/com/google/araploxio/AraPloxActivity.java
index e323b4b..19ec770 100644
--- a/src/com/google/araplox/AraPloxActivity.java
+++ b/src/com/google/araploxio/AraPloxActivity.java
@@ -1,4 +1,4 @@
-package com.google.araplox;
+package com.google.araploxio;
import org.achartengine.ChartFactory;
import org.achartengine.GraphicalView;
@@ -20,8 +20,6 @@
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.google.araplox.AFE4400Thread;
-
public class AraPloxActivity extends Activity {
private static final String TAG = "AraPlox/Activity";
