Merge branch 'master' of github.com:Determinant/piztor

1 files changed, 22 insertions, 25 deletions

diff --git a/client/Piztor/res/layout/custom_text_view.xml b/client/Piztor/res/layout/custom_text_view.xml
index 5ef1c9f..dac54ce 100644
--- a/client/Piztor/res/layout/custom_text_view.xml
+++ b/client/Piztor/res/layout/custom_text_view.xml
@@ -13,35 +13,32 @@
         android:background="@drawable/popup_side"
          android:gravity="center"
         android:textStyle="bold"
-         android:textColor="#3814ed"
-        android:text="更新位置"
+        android:textColor="@android:color/black"
         android:textSize="12sp" />
-
    
      <LinearLayout
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
 	    android:orientation="vertical"
-	    android:id="@+id/popinfo"
-	    >
+	    android:id="@+id/popinfo">
 	    
-    <TextView
-        android:id="@+id/textcache"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/popup_middle"
-        android:gravity="center"
-        android:textStyle="bold"
-        android:textColor="@android:color/black"
-        android:textSize="12sp" />
+    	<TextView
+        	android:id="@+id/textcache"
+        	android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"
+        	android:background="@drawable/popup_middle"
+        	android:gravity="center"
+        	android:textStyle="bold"
+        	android:textColor="@android:color/black"
+        	android:textSize="12sp" />
     
-     <TextView
-        android:id="@+id/popdown"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/popup_down"
-        android:textColor="@android:color/black"
-        android:textSize="12sp" />
+     	<TextView
+        	android:id="@+id/popdown"
+        	android:layout_width="fill_parent"
+        	android:layout_height="wrap_content"
+        	android:background="@drawable/popup_down"
+        	android:textColor="@android:color/black"
+        	android:textSize="12sp" />
     
     
     </LinearLayout>
@@ -52,10 +49,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/popup_side"
-        android:textColor="#3814ed"
+        android:textColor="@android:color/black"
         android:gravity="center"
         android:textStyle="bold"
-        android:text="更新marker"
-        android:textSize="12sp" />
+        android:textSize="12sp" 
+        android:text="cancel"/>
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file