diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-05-15 10:52:33 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 10:52:33 -0700 |
| commit | 448b28beffdfcc6887a645d5a994440a2e8d01b4 (patch) | |
| tree | b6855c4add00cfab93c7f90caa26e020ad03bc94 /java/res/layout | |
| parent | 64510ad979fb0d9716fd64ef3aa937ca1d08d24a (diff) | |
| parent | ed0d1156f7c95666b22e10284d8f985a5e83f283 (diff) | |
| download | latinime-448b28beffdfcc6887a645d5a994440a2e8d01b4.tar.gz latinime-448b28beffdfcc6887a645d5a994440a2e8d01b4.tar.xz latinime-448b28beffdfcc6887a645d5a994440a2e8d01b4.zip | |
am ed0d1156: am 30f102e2: Move some attributes of setup wizard layouts to style files
* commit 'ed0d1156f7c95666b22e10284d8f985a5e83f283':
Move some attributes of setup wizard layouts to style files
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/setup_step.xml | 28 | ||||
| -rw-r--r-- | java/res/layout/setup_wizard.xml | 3 |
2 files changed, 4 insertions, 27 deletions
diff --git a/java/res/layout/setup_step.xml b/java/res/layout/setup_step.xml index c15d07bad..c6462e903 100644 --- a/java/res/layout/setup_step.xml +++ b/java/res/layout/setup_step.xml @@ -25,34 +25,14 @@ <TextView android:id="@+id/setup_step_title" style="@style/setupStepTitleStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingLeft="24dp" - android:paddingRight="24dp" /> + android:paddingBottom="16dp" /> <TextView android:id="@+id/setup_step_instruction" style="@style/setupStepInstructionStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingBottom="16dp" - android:paddingLeft="24dp" - android:paddingRight="24dp" /> - <View - android:layout_width="match_parent" - android:layout_height="2dp" /> - <Button + android:paddingBottom="16dp" /> + <TextView android:id="@+id/setup_step_action_label" style="@style/setupStepActionLabelStyle" - android:gravity="center_vertical" - android:drawablePadding="12dp" - android:layout_width="match_parent" - android:layout_height="48dp" - android:clickable="true" - android:focusable="true" - android:paddingLeft="12dp" - android:paddingStart="12dp" - android:paddingRight="24dp" - android:paddingEnd="24dp" /> + android:layout_marginTop="2dp" /> </LinearLayout> diff --git a/java/res/layout/setup_wizard.xml b/java/res/layout/setup_wizard.xml index 6e2d19f81..56d4d2fa8 100644 --- a/java/res/layout/setup_wizard.xml +++ b/java/res/layout/setup_wizard.xml @@ -33,10 +33,7 @@ <TextView android:id="@+id/setup_title" style="@style/setupTitleStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" android:layout_alignParentTop="true" /> <LinearLayout android:id="@+id/setup_step_bullets" |