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

Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev

Browse Source
This commit is contained in:
PauloftheWest
2014-09-04 12:50:03 +00:00
committed by Android (Google) Code Review
parent c91d2cd082 56217c05cd
commit e1a164bf9b
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/layout/wifi_assistant_card.xml
View File

@@ -69,22 +69,13 @@
<Button <Button
android:id="@+id/no_thanks_button" android:id="@+id/no_thanks_button"
android:background="@android:color/white"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/wifi_assistant_no_thanks" android:text="@string/wifi_assistant_no_thanks"
android:paddingLeft="@dimen/wifi_assistant_text_padding" style="@style/WifiAssistantButton.Negative" />
android:paddingRight="@dimen/wifi_assistant_text_padding" />
<Button <Button
android:id="@+id/setup" android:id="@+id/setup"
android:background="@android:color/white"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:paddingLeft="@dimen/wifi_assistant_text_padding"
android:paddingRight="@dimen/wifi_assistant_text_padding"
android:text="@string/wifi_assistant_setup" android:text="@string/wifi_assistant_setup"
style="@style/WifiAssistantButton" /> style="@style/WifiAssistantButton.Positive" />
</LinearLayout> </LinearLayout>

11
res/values/styles.xml
View File

@@ -313,7 +313,18 @@
</style> </style>
<style name="WifiAssistantButton"> <style name="WifiAssistantButton">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:background">@android:color/white</item>
<item name="android:paddingStart">@dimen/wifi_assistant_text_padding</item>
<item name="android:paddingEnd">@dimen/wifi_assistant_text_padding</item>
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item> <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
</style>
<style name="WifiAssistantButton.Negative">
</style>
<style name="WifiAssistantButton.Positive">
<item name="android:textColor">@color/wifi_assistant_color_accent</item> <item name="android:textColor">@color/wifi_assistant_color_accent</item>
</style> </style>