Update Settings to use DeviceDefault colored button

Uses new Widget.DeviceDefault.Button.Colored style.
Also updates some of the styles to use DeviceDefault
instead of Material styles for a bunch of button styles.

Bug: 64122537
Bug: 69314526
Test: ag/3228846
Change-Id: I478dfdb5ea67ae1882cfee66050ed44fcda3d80d
This commit is contained in:
Andrew Sapperstein
2017-11-13 16:05:29 -08:00
parent d76496dca1
commit 0efac4693f
3 changed files with 7 additions and 7 deletions

View File

@@ -63,7 +63,7 @@
android:layout_height="wrap_content"
android:layout_below="@android:id/summary"
android:text="@string/storage_menu_free"
style="@android:style/@Widget.Material.Button.Colored" />
style="@style/ActionPrimaryButton" />
</LinearLayout>
<com.android.settings.widget.DonutView

View File

@@ -61,7 +61,7 @@
<Button
android:id="@android:id/primary"
style="@style/SuwGlifButton.Primary"
style="@style/ActionPrimaryButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"

View File

@@ -337,10 +337,10 @@
<style name="TextAppearance.SupportSummary" parent="TextAppearance.CategoryTitle"/>
<style name="SupportPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
<style name="SupportPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
<style name="SupportSecondaryButton"
parent="android:Widget.Material.Button.Borderless.Colored">
parent="android:Widget.DeviceDefault.Button.Borderless.Colored">
<item name="android:textSize">12sp</item>
</style>
@@ -424,11 +424,11 @@
<item name="android:textSize">16sp</item>
</style>
<style name="ActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
<style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
<style name="ActionSecondaryButton" parent="android:Widget.Material.Button"/>
<style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
<style name="DreamStartButton" parent="android:Widget.Material.Button" />
<style name="DreamStartButton" parent="android:Widget.DeviceDefault.Button" />
<style name="LockPatternContainerStyle">
<item name="android:maxHeight">400dp</item>