PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3b9b6533: Merge "Use style for buttons in setup wizard flow" into honeycomb

Browse Source 
* commit '3b9b6533a5e50ed146ec24c084533fa35a2d1d01':
  Use style for buttons in setup wizard flow
This commit is contained in:
Daisuke Miyakawa
2011-01-17 11:41:31 -08:00
committed by Android Git Automerger
parent 552de6cbf2 3b9b6533a5
commit 0518b7f36c
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout-xlarge/date_time_settings_setupwizard.xml
View File

@@ -158,10 +158,8 @@
<Button <Button
android:id="@+id/next_button" android:id="@+id/next_button"
android:layout_width="208dip" style="@style/setup_wizard_button"
android:layout_height="48dip"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:text="@string/next_label" android:text="@string/next_label" />
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout> </RelativeLayout>

24
res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
View File

@@ -120,54 +120,42 @@
android:layout_marginBottom="16dip"> android:layout_marginBottom="16dip">
<Button android:id="@+id/wifi_setup_forget" <Button android:id="@+id/wifi_setup_forget"
android:layout_width="208dip" style="@style/setup_wizard_button"
android:layout_height="48dip"
android:layout_marginLeft="16dip" android:layout_marginLeft="16dip"
android:text="@string/wifi_setup_forget" android:text="@string/wifi_setup_forget"
android:textAppearance="?android:attr/textAppearanceMedium"
android:visibility="gone" /> android:visibility="gone" />
<Button android:id="@+id/wifi_setup_connect" <Button android:id="@+id/wifi_setup_connect"
android:layout_width="208dip" style="@style/setup_wizard_button"
android:layout_height="48dip"
android:layout_marginTop="96dip" android:layout_marginTop="96dip"
android:layout_marginLeft="16dip" android:layout_marginLeft="16dip"
android:text="@string/wifi_setup_connect" android:text="@string/wifi_setup_connect"
android:textAppearance="?android:attr/textAppearanceMedium"
android:enabled="false" android:enabled="false"
android:visibility="gone" /> android:visibility="gone" />
<Button android:id="@+id/wifi_setup_add_network" <Button android:id="@+id/wifi_setup_add_network"
android:layout_width="208dip" style="@style/setup_wizard_button"
android:layout_height="48dip"
android:layout_marginLeft="16dip" android:layout_marginLeft="16dip"
android:text="@string/wifi_setup_add_network" android:text="@string/wifi_setup_add_network"
android:textAppearance="?android:attr/textAppearanceMedium"
android:enabled="false" /> android:enabled="false" />
<Button android:id="@+id/wifi_setup_refresh_list" <Button android:id="@+id/wifi_setup_refresh_list"
android:layout_width="208dip" style="@style/setup_wizard_button"
android:layout_height="48dip"
android:layout_marginLeft="16dip" android:layout_marginLeft="16dip"
android:text="@string/wifi_setup_refresh_list" android:text="@string/wifi_setup_refresh_list"
android:textAppearance="?android:attr/textAppearanceMedium"
android:enabled="false" /> android:enabled="false" />
<Button android:id="@+id/wifi_setup_skip_or_next" <Button android:id="@+id/wifi_setup_skip_or_next"
android:layout_width="208dip" style="@style/setup_wizard_button"
android:layout_height="48dip"
android:layout_marginTop="96dip" android:layout_marginTop="96dip"
android:layout_marginLeft="16dip" android:layout_marginLeft="16dip"
android:text="@string/wifi_setup_skip" android:text="@string/wifi_setup_skip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:enabled="false" /> android:enabled="false" />
</LinearLayout> </LinearLayout>
<!-- This misleading name is for keeping consistency between non-XL layouts --> <!-- This misleading name is for keeping consistency between non-XL layouts -->
<Button android:id="@+id/wifi_setup_cancel" <Button android:id="@+id/wifi_setup_cancel"
android:layout_width="208dip" style="@style/setup_wizard_button"
android:layout_height="48dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginBottom="16dip" android:layout_marginBottom="16dip"
android:layout_alignBottom="@+id/content" android:layout_alignBottom="@+id/content"
android:layout_toLeftOf="@id/right_buttons" android:layout_toLeftOf="@id/right_buttons"

9
res/values-xlarge/styles.xml
View File

@@ -50,4 +50,11 @@
<item name="android:orientation">vertical</item> <item name="android:orientation">vertical</item>
</style> </style>
</resources> <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>

5
res/values/styles.xml
View File

@@ -109,4 +109,9 @@
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:orientation">vertical</item> <item name="android:orientation">vertical</item>
</style> </style>
<style name="setup_wizard_button">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
</style>
</resources> </resources>