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

Merge "Update Settings to use DeviceDefault colored button"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-28 21:23:49 +00:00
committed by Android (Google) Code Review
parent 22ca66df94 0efac4693f
commit b1edae2d04
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/storage_summary_donut.xml
View File

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

2
res/layout/suggestion_tile_with_button.xml
View File

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

10
res/values/styles.xml
View File

@@ -338,10 +338,10 @@
<style name="TextAppearance.SupportSummary" parent="TextAppearance.CategoryTitle"/> <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" <style name="SupportSecondaryButton"
parent="android:Widget.Material.Button.Borderless.Colored"> parent="android:Widget.DeviceDefault.Button.Borderless.Colored">
<item name="android:textSize">12sp</item> <item name="android:textSize">12sp</item>
</style> </style>
@@ -425,11 +425,11 @@
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </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"> <style name="LockPatternContainerStyle">
<item name="android:maxHeight">400dp</item> <item name="android:maxHeight">400dp</item>