Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev (e1a164bf) · Commits · e / os / android_packages_apps_Settings

res/layout/wifi_assistant_card.xml

+2 −11

Original line number	Diff line number	Diff line
		@@ -69,22 +69,13 @@

		<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:paddingLeft="@dimen/wifi_assistant_text_padding"
		android:paddingRight="@dimen/wifi_assistant_text_padding" />
		style="@style/WifiAssistantButton.Negative" />

		<Button
		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"
		style="@style/WifiAssistantButton" />
		style="@style/WifiAssistantButton.Positive" />

		</LinearLayout>

+11 −0

Original line number	Diff line number	Diff line
		@@ -313,7 +313,18 @@
		</style>

		<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>
		</style>

		<style name="WifiAssistantButton.Negative">
		</style>

		<style name="WifiAssistantButton.Positive">
		<item name="android:textColor">@color/wifi_assistant_color_accent</item>
		</style>