Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Ib8239cbcce4eee95885ce0221891ec2245914a1f
diff --git a/Android.mk b/Android.mk
index 36faf42..964d408 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,9 @@
LOCAL_SRC_FILES := $(call all-java-files-under, AndroidPlot-Core/src/main)
+# b/73499927
+LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
+
include ${BUILD_STATIC_JAVA_LIBRARY}
## Demo app
@@ -40,4 +43,7 @@
LOCAL_MANIFEST_FILE := Examples/DemoApp/AndroidManifest.xml
LOCAL_SRC_FILES := $(call all-java-files-under, Examples/DemoApp/src)
+# b/73499927
+LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
+
include $(BUILD_PACKAGE)
diff --git a/Examples/DemoApp/res/values/style.xml b/Examples/DemoApp/res/values/style.xml
index d465715..188f3a0 100644
--- a/Examples/DemoApp/res/values/style.xml
+++ b/Examples/DemoApp/res/values/style.xml
@@ -14,7 +14,7 @@
~ limitations under the License.
-->
-<resources xmlns="http://schemas.android.com/apk/lib/com.androidplot.xy">
+<resources xmlns:android="http://schemas.android.com/apk/lib/com.androidplot.xy">
<style name="sample_activity">
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
@@ -31,4 +31,4 @@
<!--<item name="XYPlot:androidplot.title">my domain</item>-->
</style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..64175e8
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,18 @@
+name: "androidplot"
+description: "A library for creating dynamic and static charts in Android apps."
+third_party {
+ url {
+ type: HOMEPAGE
+ value: "https://github.com/halfhp/androidplot"
+ }
+ url {
+ type: ARCHIVE
+ value: "https://github.com/halfhp/androidplot/archive/0.6.0.zip"
+ }
+ version: "0.6.0"
+ last_upgrade_date {
+ year: 2014
+ month: 2
+ day: 21
+ }
+}
