Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1edae2d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update Settings to use DeviceDefault colored button"

parents 22ca66df 0efac469

res/layout/storage_summary_donut.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

res/layout/suggestion_tile_with_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

res/values/styles.xml

+5 −5
Original line number Diff line number Diff line
@@ -338,10 +338,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>
@@ -425,11 +425,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>