From 1ac485ec0eff95b11ba80a3c98b8ddfd9c5be56f Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Fri, 7 Mar 2014 07:10:15 +0000 Subject: [PATCH] Merge changes from Yue --- AndroidManifest.xml | 3 +- res/layout/main.xml | 284 +++++++++++++- src/edu/ucla/iBeaconNav/CMD.java | 28 +- src/edu/ucla/iBeaconNav/Main.java | 127 ++++++- src/edu/ucla/iBeaconNav/Matrix.java | 78 ++++ src/edu/ucla/iBeaconNav/Sensors.java | 548 +++++++++++++++++++++++++++ 6 files changed, 1043 insertions(+), 25 deletions(-) create mode 100644 src/edu/ucla/iBeaconNav/Matrix.java create mode 100644 src/edu/ucla/iBeaconNav/Sensors.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8f0b15b..786e5c9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,7 +19,7 @@ android:glEsVersion="0x00020000" android:required="true"/> @@ -33,6 +33,7 @@ + - + android:layout_height="wrap_content" + android:columnCount="1" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +