diff options
| -rw-r--r-- | res/layout-xlarge/date_time_settings_setupwizard.xml | 6 | ||||
| -rw-r--r-- | res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml | 24 | ||||
| -rw-r--r-- | res/values-xlarge/styles.xml | 9 | ||||
| -rw-r--r-- | res/values/styles.xml | 5 |
4 files changed, 21 insertions, 23 deletions
diff --git a/res/layout-xlarge/date_time_settings_setupwizard.xml b/res/layout-xlarge/date_time_settings_setupwizard.xml index 600cdbd..483b66a 100644 --- a/res/layout-xlarge/date_time_settings_setupwizard.xml +++ b/res/layout-xlarge/date_time_settings_setupwizard.xml @@ -158,10 +158,8 @@ <Button android:id="@+id/next_button" - android:layout_width="208dip" - android:layout_height="48dip" + style="@style/setup_wizard_button" android:layout_alignParentBottom="true" android:layout_alignParentRight="true" - android:text="@string/next_label" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:text="@string/next_label" /> </RelativeLayout> diff --git a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml index d3af1f8..df6cfbf 100644 --- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml +++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml @@ -120,54 +120,42 @@ android:layout_marginBottom="16dip"> <Button android:id="@+id/wifi_setup_forget" - android:layout_width="208dip" - android:layout_height="48dip" + style="@style/setup_wizard_button" android:layout_marginLeft="16dip" android:text="@string/wifi_setup_forget" - android:textAppearance="?android:attr/textAppearanceMedium" android:visibility="gone" /> <Button android:id="@+id/wifi_setup_connect" - android:layout_width="208dip" - android:layout_height="48dip" + style="@style/setup_wizard_button" android:layout_marginTop="96dip" android:layout_marginLeft="16dip" android:text="@string/wifi_setup_connect" - android:textAppearance="?android:attr/textAppearanceMedium" android:enabled="false" android:visibility="gone" /> <Button android:id="@+id/wifi_setup_add_network" - android:layout_width="208dip" - android:layout_height="48dip" + style="@style/setup_wizard_button" android:layout_marginLeft="16dip" android:text="@string/wifi_setup_add_network" - android:textAppearance="?android:attr/textAppearanceMedium" android:enabled="false" /> <Button android:id="@+id/wifi_setup_refresh_list" - android:layout_width="208dip" - android:layout_height="48dip" + style="@style/setup_wizard_button" android:layout_marginLeft="16dip" android:text="@string/wifi_setup_refresh_list" - android:textAppearance="?android:attr/textAppearanceMedium" android:enabled="false" /> <Button android:id="@+id/wifi_setup_skip_or_next" - android:layout_width="208dip" - android:layout_height="48dip" + style="@style/setup_wizard_button" android:layout_marginTop="96dip" android:layout_marginLeft="16dip" android:text="@string/wifi_setup_skip" - android:textAppearance="?android:attr/textAppearanceMedium" android:enabled="false" /> </LinearLayout> <!-- This misleading name is for keeping consistency between non-XL layouts --> <Button android:id="@+id/wifi_setup_cancel" - android:layout_width="208dip" - android:layout_height="48dip" - android:textAppearance="?android:attr/textAppearanceMedium" + style="@style/setup_wizard_button" android:layout_marginBottom="16dip" android:layout_alignBottom="@+id/content" android:layout_toLeftOf="@id/right_buttons" diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml index 5e3fead..9b125ad 100644 --- a/res/values-xlarge/styles.xml +++ b/res/values-xlarge/styles.xml @@ -50,4 +50,11 @@ <item name="android:orientation">vertical</item> </style> -</resources>
\ No newline at end of file + <style name="setup_wizard_button"> + <item name="android:layout_width">wrap_content</item> + <item name="android:minWidth">208dip</item> + <item name="android:layout_height">48dip</item> + <item name="android:textAppearance">?android:attr/textAppearanceMedium</item> + </style> + +</resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 969742f..c361fa9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -109,4 +109,9 @@ <item name="android:layout_height">wrap_content</item> <item name="android:orientation">vertical</item> </style> + + <style name="setup_wizard_button"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + </style> </resources> |