diff options
| author | Jack Yu <jackyu@google.com> | 2019-10-29 17:07:19 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-29 17:07:19 -0700 |
| commit | c07c2d8f699dddb480176429370f605fa4231ad1 (patch) | |
| tree | 439040c84d5f69ff0237104f383df8479c8e2662 /res | |
| parent | 108a2f3266ac8f2ab2f7e4d02eba80dfba9bb530 (diff) | |
| parent | ae3c6d69612a13c7132dcaff1fc2b59db4656421 (diff) | |
| download | Stk-c07c2d8f699dddb480176429370f605fa4231ad1.tar.gz | |
Merge "Improve the UI layout of the input screen" am: 58cf752ac5 am: 492789375a
am: ae3c6d6961
Change-Id: I42f8738b0e903e3f5890985c60aef55f662aae49
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/stk_input.xml | 50 |
1 files changed, 21 insertions, 29 deletions
diff --git a/res/layout/stk_input.xml b/res/layout/stk_input.xml index 7f8f96d..427ad42 100644 --- a/res/layout/stk_input.xml +++ b/res/layout/stk_input.xml @@ -19,8 +19,15 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="?android:attr/colorBackground" + android:elevation="4dp" + android:theme="@style/ThemeOverlay.AppCompat.ActionBar"/> <ImageButton - style="@android:style/Widget.Material.ActionButton.Overflow" + style="@style/Widget.AppCompat.ActionButton.Overflow" android:id="@+id/more" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -62,32 +69,17 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content"> - <LinearLayout - android:id="@+id/input_restriction_info" - android:layout_width="wrap_content" + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/text_input_layout" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="4dip" - android:orientation="vertical"> - <TextView - android:id="@+id/input_type" - android:gravity="start" - 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:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="?android:attr/textColorSecondary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - </LinearLayout> - <EditText - android:id="@+id/in_text" - android:layout_gravity="center_horizontal" android:layout_marginBottom="16dip" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:orientation="vertical"> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/in_text" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + </com.google.android.material.textfield.TextInputLayout> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -102,13 +94,13 @@ android:layout_weight="1" android:gravity="center_vertical" android:paddingStart="0dip" - style="@android:style/Widget.Material.Button.Borderless.Colored" + style="@style/Widget.AppCompat.Button.Borderless.Colored" android:text="@string/button_cancel" /> <Button android:id="@+id/button_ok" android:layout_height="48dip" android:layout_width="wrap_content" - style="@android:style/Widget.Material.Button.Colored" + style="@style/Widget.AppCompat.Button.Colored" android:text="@string/button_ok" /> </LinearLayout> </LinearLayout> @@ -123,13 +115,13 @@ android:id="@+id/button_no" android:layout_height="wrap_content" android:layout_width="wrap_content" - style="@android:style/Widget.Material.Button.Borderless.Colored" + style="@style/Widget.AppCompat.Button.Borderless.Colored" android:text="@string/button_no" /> <Button android:id="@+id/button_yes" android:layout_height="wrap_content" android:layout_width="wrap_content" - style="@android:style/Widget.Material.Button.Colored" + style="@style/Widget.AppCompat.Button.Colored" android:text="@string/button_yes" /> </LinearLayout> </LinearLayout> |