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

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

Merge changes Ib19f1bcb,Ie209d793 into main 

* changes:
  [PM] Support material AlertDialog (8/N)
  [PM] Support material AlertDialog (7/N)
parents 29f65ea5 80a5d11b

packages/PackageInstaller/res/drawable/background_colored_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
<inset xmlns:android="http://schemas.android.com/apk/res/android">

    <shape android:shape="rectangle">

        <corners android:radius="40dp"/>

        <solid android:color="?android:attr/colorAccent"/>

        <solid android:color="@color/primaryColor"/>

    </shape>

</inset>

packages/PackageInstaller/res/drawable/background_outlined_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ 
    <corners android:radius="24dp" />

    <stroke

        android:width="1dp"

        android:color="@color/colorButtonOutline"/>

        android:color="@color/outlineVariantColor"/>

</shape>

packages/PackageInstaller/res/values-night/colors.xml

+5 −1
Original line number Diff line number Diff line
@@ -15,5 +15,9 @@ 
  ~ limitations under the License.

  -->

<resources>

    <color name="colorButtonOutline">@android:color/system_outline_variant_dark</color>

    <color name="onPrimaryColor">@android:color/system_on_primary_dark</color>

    <color name="onSurfaceColor">@android:color/system_on_surface_dark</color>

    <color name="onSurfaceVariantColor">@android:color/system_on_surface_variant_dark</color>

    <color name="outlineVariantColor">@android:color/system_outline_variant_dark</color>

    <color name="primaryColor">@android:color/system_primary_dark</color>

</resources>

packages/PackageInstaller/res/values/colors.xml

+6 −1
Original line number Diff line number Diff line
@@ -17,5 +17,10 @@ 


<resources>

    <color name="bigIconColor">#C8CCCE</color>

    <color name="colorButtonOutline">@android:color/system_outline_variant_light</color>



    <color name="onPrimaryColor">@android:color/system_on_primary_light</color>

    <color name="onSurfaceColor">@android:color/system_on_surface_light</color>

    <color name="onSurfaceVariantColor">@android:color/system_on_surface_variant_light</color>

    <color name="outlineVariantColor">@android:color/system_outline_variant_light</color>

    <color name="primaryColor">@android:color/system_primary_light</color>

</resources>

packages/PackageInstaller/res/values/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -53,4 +53,9 @@ 
    <dimen name="dialog_inter_element_vertical_margin">12dp</dimen>

    <dimen name="alert_dialog_radius">28dp</dimen>

    <dimen name="alert_dialog_dim_amount">0.68</dimen>

    <!-- 24dp + 364dp + 24dp for the portrait mode -->

    <dimen name="alert_dialog_min_width_minor">412dp</dimen>

    <!-- Override the values for the buttonbar paddings in M3 MaterialAlertDialog -->

    <dimen name="m3_alert_dialog_action_top_padding">8dp</dimen>

    <dimen name="m3_alert_dialog_action_bottom_padding">8dp</dimen>

</resources>