summaryrefslogtreecommitdiff
path: root/client/Piztor/res/layout/activity_login.xml
diff options
context:
space:
mode:
authorTeddy <ted.sybil@gmail.com>2013-09-01 11:42:25 +0800
committerTeddy <ted.sybil@gmail.com>2013-09-01 11:42:25 +0800
commit2f3d03524da427faf407903b5764ab745613313d (patch)
treeb9dcf3b6f4eda2eec2278e536df1314267b5c2c6 /client/Piztor/res/layout/activity_login.xml
parentd3c6b23cfade2cc91b45dda5eb62e8a7d2398a18 (diff)
parent8b8109ff5dadf03dfeb68a5c47ee0fe0465de197 (diff)
Merge branch 'master' of github.com:Determinant/piztor
Diffstat (limited to 'client/Piztor/res/layout/activity_login.xml')
-rw-r--r--client/Piztor/res/layout/activity_login.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml
index a8cf47f..c408a1d 100644
--- a/client/Piztor/res/layout/activity_login.xml
+++ b/client/Piztor/res/layout/activity_login.xml
@@ -39,7 +39,8 @@
android:paddingLeft="12.0dip"
android:layout_width="fill_parent"
android:layout_height="44.0dip"
- android:hint="@string/username" android:maxLines="1"
+ android:hint="@string/username"
+ android:maxLines="1"
android:maxLength="16"/>
<View
android:background="#ffc0c3c4"
@@ -75,7 +76,7 @@
android:layout_marginLeft="70.0dip"
android:layout_marginRight="70.0dip"
android:layout_marginTop="12.0dip"
- android:text="login"
+ android:text="@string/login"
android:layout_below="@id/user_layout" />
</RelativeLayout> \ No newline at end of file