summaryrefslogtreecommitdiff
path: root/client/Piztor/res
diff options
context:
space:
mode:
authorTeddy <[email protected]>2013-08-29 16:30:18 +0800
committerTeddy <[email protected]>2013-08-29 16:30:18 +0800
commit88894471c3d35bb9d25cf416bee07b08641c3149 (patch)
tree38d871f5d6448486b8794c55672d8e494e7a29c8 /client/Piztor/res
parent3528fbd730a6d28e7e0139d00bcf04b36644e8f8 (diff)
parentd29aafc17b633a2fd3598b6283861f7da155bd06 (diff)
Merge branch 'master' of github.com:Determinant/piztor
Diffstat (limited to 'client/Piztor/res')
-rw-r--r--client/Piztor/res/drawable/dialog_cancel.pngbin0 -> 1316 bytes
-rw-r--r--client/Piztor/res/layout/custom_text_view.xml47
2 files changed, 22 insertions, 25 deletions
diff --git a/client/Piztor/res/drawable/dialog_cancel.png b/client/Piztor/res/drawable/dialog_cancel.png
new file mode 100644
index 0000000..d59a5e5
--- /dev/null
+++ b/client/Piztor/res/drawable/dialog_cancel.png
Binary files differ
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