]> Pileus Git - ~andy/iBeaconNav/blobdiff - res/layout/main.xml
Merge changes from Yue
[~andy/iBeaconNav] / res / layout / main.xml
index 1219ee8ff661e7948a9fd6523b87461989c59b34..4a797b894c3a81896db36dcfb212f1e9d75d2e58 100644 (file)
                        android:layout_width="fill_parent"
                        android:layout_height="fill_parent">
                        <LinearLayout
-                               android:id="@+id/map"
+                               android:id="@+id/state"
                                android:orientation="vertical"
                                android:layout_width="fill_parent"
                                android:layout_height="fill_parent">
-                               <fragment
-                                       xmlns:android="http://schemas.android.com/apk/res/android"
-                                       android:id="@+id/map_fragment"
+                               <GridLayout
                                        android:layout_width="match_parent"
-                                       android:layout_height="match_parent"
-                                       android:name="com.google.android.gms.maps.MapFragment"/>
+                                       android:layout_height="wrap_content"
+                                       android:columnCount="1" >
+                                       <TextView
+                                               android:id="@+id/accText1"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="1"
+                                               android:text="accValueX"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/accText2"
+                                               android:layout_column="0"
+                                               android:layout_gravity="center_horizontal|top"
+                                               android:layout_row="1"
+                                               android:text="accValueY"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/accText3"
+                                               android:layout_column="0"
+                                               android:layout_gravity="right|top"
+                                               android:layout_row="1"
+                                               android:text="accValueZ"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/textView1"
+                                               android:layout_width="wrap_content"
+                                               android:layout_height="wrap_content"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|center_vertical"
+                                               android:layout_row="0"
+                                               android:text="Accelerometer Info"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                               </GridLayout>
+                               <GridLayout
+                                       android:layout_width="match_parent"
+                                       android:layout_height="wrap_content"
+                                       android:columnCount="1"
+                                       android:paddingTop="10dp" >
+                                       <TextView
+                                               android:id="@+id/wrdAccText1"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="1"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/wrdAccText2"
+                                               android:layout_column="0"
+                                               android:layout_gravity="center_horizontal|top"
+                                               android:layout_row="1"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/wrdAccText3"
+                                               android:layout_column="0"
+                                               android:layout_gravity="right|top"
+                                               android:layout_row="1"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/textView4"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="0"
+                                               android:text="World Acceleration Info"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                               </GridLayout>
+                               <GridLayout
+                                       android:layout_width="match_parent"
+                                       android:layout_height="wrap_content"
+                                       android:columnCount="1"
+                                       android:paddingTop="10dp" >
+                                       <TextView
+                                               android:id="@+id/textView8"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="0"
+                                               android:text="Gyroscope Info"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/gyrText1"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="1"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/gyrText2"
+                                               android:layout_column="0"
+                                               android:layout_gravity="center_horizontal|top"
+                                               android:layout_row="1"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/gyrText3"
+                                               android:layout_column="0"
+                                               android:layout_gravity="right|top"
+                                               android:layout_row="1"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                               </GridLayout>
+                               <GridLayout
+                                       android:layout_width="match_parent"
+                                       android:layout_height="wrap_content"
+                                       android:columnCount="1"
+                                       android:paddingTop="10dp" >
+                                       <TextView
+                                               android:id="@+id/orientText1"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="2"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/orientText2"
+                                               android:layout_column="0"
+                                               android:layout_gravity="center_horizontal|top"
+                                               android:layout_row="2"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/orientText3"
+                                               android:layout_column="0"
+                                               android:layout_gravity="right|top"
+                                               android:layout_row="2"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/textView3"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="1"
+                                               android:text="Orientation Info"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                               </GridLayout>
+                               <GridLayout
+                                       android:layout_width="match_parent"
+                                       android:layout_height="wrap_content"
+                                       android:columnCount="1"
+                                       android:paddingTop="10dp" >
+                                       <TextView
+                                               android:id="@+id/textView5"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="0"
+                                               android:text="Step Count"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/stepCntText"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="1"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/calGrvText"
+                                               android:layout_width="147dp"
+                                               android:layout_column="0"
+                                               android:layout_gravity="right|top"
+                                               android:layout_row="1"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/textView6"
+                                               android:layout_column="0"
+                                               android:layout_gravity="right|bottom"
+                                               android:layout_row="0"
+                                               android:text="Calculated Gravity"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                               </GridLayout>
+                               <GridLayout
+                                       android:layout_width="match_parent"
+                                       android:layout_height="wrap_content"
+                                       android:columnCount="1"
+                                       android:paddingTop="10dp" >
+                                       <TextView
+                                               android:id="@+id/textView7"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="0"
+                                               android:text="Current Position"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/curPosXText"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="1"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/curPosYText"
+                                               android:layout_width="147dp"
+                                               android:layout_column="0"
+                                               android:layout_gravity="right|top"
+                                               android:layout_row="1"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                               </GridLayout>
+                               <GridLayout
+                                       android:layout_width="match_parent"
+                                       android:layout_height="wrap_content"
+                                       android:columnCount="1"
+                                       android:paddingTop="10dp" >
+                                       <TextView
+                                               android:id="@+id/textView9"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="1"
+                                               android:text="Current Heading"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/headingText"
+                                               android:layout_width="wrap_content"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="2"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/textView2"
+                                               android:layout_width="146dp"
+                                               android:layout_column="0"
+                                               android:layout_gravity="right|top"
+                                               android:layout_row="1"
+                                               android:text="World GyroZ"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                                       <TextView
+                                               android:id="@+id/wrdGyrText1"
+                                               android:layout_width="146dp"
+                                               android:layout_column="0"
+                                               android:layout_gravity="right|top"
+                                               android:layout_row="2"
+                                               android:text="Medium Text"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                               </GridLayout>
+                               <GridLayout
+                                       android:layout_width="match_parent"
+                                       android:layout_height="wrap_content"
+                                       android:columnCount="1" >
+                                       <Button
+                                               android:id="@+id/rstHdBttn"
+                                               android:layout_width="108dp"
+                                               android:layout_height="wrap_content"
+                                               android:layout_column="0"
+                                               android:layout_gravity="left|top"
+                                               android:layout_row="0"
+                                               android:text="Heading Reset" />
+                                       <Button
+                                               android:id="@+id/rstDstBttn"
+                                               android:layout_width="96dp"
+                                               android:layout_column="0"
+                                               android:layout_gravity="center_horizontal|top"
+                                               android:layout_row="0"
+                                               android:text="Distance Reset" />
+                                       <TextView
+                                               android:id="@+id/stableText"
+                                               android:layout_width="84dp"
+                                               android:layout_column="0"
+                                               android:layout_gravity="right|center_vertical"
+                                               android:layout_row="0"
+                                               android:text="ifStable"
+                                               android:textAppearance="?android:attr/textAppearanceMedium" />
+                               </GridLayout>
                        </LinearLayout>
                        <LinearLayout
-                               android:id="@+id/state"
+                               android:id="@+id/map"
                                android:orientation="vertical"
                                android:layout_width="fill_parent"
                                android:layout_height="fill_parent">
-                               <TextView
-                                       android:id="@+id/state_text"
-                                       android:layout_width="fill_parent"
-                                       android:layout_height="wrap_content"
-                                       android:text="State information" />
+                               <fragment
+                                       xmlns:android="http://schemas.android.com/apk/res/android"
+                                       android:id="@+id/map_fragment"
+                                       android:layout_width="match_parent"
+                                       android:layout_height="match_parent"
+                                       android:name="com.google.android.gms.maps.MapFragment" />
                        </LinearLayout>
                        <ScrollView
                                android:id="@+id/debug_scroll"