diff options
author | Jordan Liu <jminjie@google.com> | 2017-09-26 21:02:17 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-26 21:02:17 +0000 |
commit | ba6607a0978f3b52881872b51ceebd7994164da1 (patch) | |
tree | cd81ec3ff8cca51b8892289a1aadba8378a7957b /res | |
parent | 7a6dd625e2006b8d758deb9d7c650810b0198e8b (diff) | |
parent | 35f15c245374bdbb12b2afb870bf915bc2096efe (diff) | |
download | Stk-ba6607a0978f3b52881872b51ceebd7994164da1.tar.gz |
Merge "Icon must be placed near the text string on the input screen"
am: 35f15c2453
Change-Id: I768f338174227e07e55e3159a844d09c7be983cd
Diffstat (limited to 'res')
-rwxr-xr-x[-rw-r--r--] | res/layout/stk_input.xml | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/res/layout/stk_input.xml b/res/layout/stk_input.xml index 9c3807e..fdc554d 100644..100755 --- a/res/layout/stk_input.xml +++ b/res/layout/stk_input.xml @@ -24,11 +24,21 @@ android:orientation="vertical" android:padding="20dip" android:layout_gravity="center_horizontal"> + <ImageView + android:id="@+id/icon" + android:visibility="gone" + android:layout_width="@android:dimen/notification_large_icon_width" + android:layout_height="@android:dimen/notification_large_icon_height" + android:adjustViewBounds="true" + android:layout_gravity="center" + android:scaleType="fitCenter"/> <TextView android:id="@+id/prompt" + android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textStyle="bold" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="?android:attr/textColorPrimary" android:gravity="center_horizontal" android:paddingBottom="30dip" /> <LinearLayout @@ -51,12 +61,14 @@ <TextView android:id="@+id/input_type" android:gravity="left" - android:textColor="@color/ltgrey" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="?android:attr/textColorSecondary" android:layout_width="wrap_content" android:layout_height="wrap_content" /> <TextView android:id="@+id/num_of_chars" - android:textColor="@color/ltgrey" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="?android:attr/textColorSecondary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dip" /> |