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

Commit 80a5d11b authored by Ivan Chiang's avatar Ivan Chiang
Browse files

[PM] Support material AlertDialog (8/N) 

- Update the colors
- Do a little refactor for the styles

Flag: android.content.pm.use_pia_v2
Test: manual
Bug: 274120822
Change-Id: Ib19f1bcb0b507063fe895175420f9a2d949b6a54
parent bd8b8e1d

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/styles.xml

+27 −21
Original line number Diff line number Diff line
@@ -19,36 +19,36 @@ 
    <!-- TODO (b/274120822): Remove these styles when we replace all dialogs to MaterialAlertDialog -->

    <style name="Widget.PackageInstaller.Button.Colored" parent="android:Widget.DeviceDefault.Button.Colored">

        <item name="android:background">@drawable/background_colored_button</item>

        <item name="android:layout_marginStart">8dp</item>

        <item name="android:minHeight">@dimen/button_min_height</item>

        <item name="android:paddingHorizontal">24dp</item>

        <item name="android:layout_marginStart">8dp</item>

        <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Widget.Button</item>

    </style>



    <style name="Widget.PackageInstaller.Button.Outlined" parent="android:Widget.DeviceDefault.Button.Colored">

        <item name="android:background">@drawable/background_outlined_button</item>

        <item name="android:textColor">?android:attr/colorAccent</item>

        <item name="android:minHeight">@dimen/button_min_height</item>

        <item name="android:layout_marginStart">8dp</item>

        <item name="android:minHeight">@dimen/button_min_height</item>

        <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Widget.Button</item>

        <item name="android:textColor">@color/primaryColor</item>

    </style>



    <style name="Widget.PackageInstaller.ButtonBar" parent="">

        <item name="android:paddingBottom">20dp</item>

        <item name="android:paddingTop">4dp</item>

        <item name="android:paddingHorizontal">12dp</item>

        <item name="android:paddingTop">4dp</item>

        <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Widget.Button</item>

    </style>



    <style name="Widget.PackageInstaller.WindowTitle" parent="">

        <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Headline</item>

        <item name="android:layout_marginTop">4dp</item>

        <item name="android:autoSizeTextType">uniform</item>

        <item name="android:layout_marginTop">4dp</item>

        <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Headline</item>

    </style>



    <style name="TextAppearance.PackageInstaller.AppLabel" parent="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle">

        <item name="android:textFontWeight">600</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textFontWeight">600</item>

    </style>



    <style name="TextAppearance.PackageInstaller.CustomMessage" parent="@android:style/TextAppearance.DeviceDefault.SearchResult.Subtitle">
@@ -71,36 +71,38 @@ 
    </style>



    <style name="Widget.PackageInstaller.Material.WindowTitle" parent="@style/MaterialAlertDialog.Material3.Title.Text">

        <item name="android:textAppearance">@style/TextAppearance.PackageInstaller.HeadlineSmall</item>

        <item name="android:layout_marginTop">4dp</item>

        <item name="android:autoSizeTextType">uniform</item>

        <item name="android:layout_marginTop">4dp</item>

        <item name="android:textAppearance">@style/TextAppearance.PackageInstaller.Material.Title</item>

    </style>



    <style name="Widget.PackageInstaller.Material.Button" parent="@style/Widget.Material3.Button.TextButton.Dialog">

        <item name="android:textColor">?android:attr/colorAccent</item>

        <item name="android:minHeight">@dimen/button_min_height</item>

        <item name="android:layout_marginStart">8dp</item>

        <item name="android:minHeight">@dimen/button_min_height</item>

        <item name="android:textAppearance">@style/TextAppearance.PackageInstaller.LabelLarge</item>

        <item name="android:textColor">@color/primaryColor</item>

    </style>



    <style name="Widget.PackageInstaller.Material.Button.Colored" parent="@style/Widget.Material3.Button">

        <item name="android:minHeight">@dimen/button_min_height</item>

        <item name="android:insetTop">0dp</item>

        <item name="android:insetBottom">0dp</item>

        <item name="android:insetTop">0dp</item>

        <item name="android:layout_marginStart">8dp</item>

        <item name="android:minHeight">@dimen/button_min_height</item>

        <item name="android:paddingHorizontal">16dp</item>

        <item name="android:textAppearance">@style/TextAppearance.PackageInstaller.LabelLarge</item>

        <item name="android:textColor">@color/onPrimaryColor</item>

        <item name="backgroundTint">@color/primaryColor</item>

    </style>



    <style name="Widget.PackageInstaller.Material.Button.Outlined" parent="@style/Widget.Material3.Button.OutlinedButton">

        <item name="android:textColor">?android:attr/colorAccent</item>

        <item name="android:minHeight">@dimen/button_min_height</item>

        <item name="strokeColor">?attr/colorOutlineVariant</item>

        <item name="android:insetTop">0dp</item>

        <item name="android:insetBottom">0dp</item>

        <item name="android:insetTop">0dp</item>

        <item name="android:layout_marginStart">8dp</item>

        <item name="android:minHeight">@dimen/button_min_height</item>

        <item name="android:paddingHorizontal">16dp</item>

        <item name="android:textAppearance">@style/TextAppearance.PackageInstaller.LabelLarge</item>

        <item name="android:textColor">@color/primaryColor</item>

        <item name="strokeColor">@color/outlineVariantColor</item>

    </style>



    <style name="TextAppearance.PackageInstaller.HeadlineSmall" parent="@android:style/TextAppearance.DeviceDefault.Headline">
@@ -144,19 +146,23 @@ 
    </style>



    <style name="TextAppearance.PackageInstaller.Material.AppLabel" parent="@style/TextAppearance.PackageInstaller.TitleMedium">

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textColor">@color/onSurfaceColor</item>

    </style>



    <style name="TextAppearance.PackageInstaller.Material.CustomMessage" parent="@style/TextAppearance.PackageInstaller.BodyMedium">

        <item name="android:textColor">?android:attr/textColorSecondary</item>

        <item name="android:textColor">@color/onSurfaceVariantColor</item>

    </style>



    <style name="TextAppearance.PackageInstaller.Material.KeepData.Heading" parent="@style/TextAppearance.PackageInstaller.LabelLarge">

        <item name="android:textColor">?android:attr/textColorSecondary</item>

        <item name="android:textColor">@color/onSurfaceVariantColor</item>

    </style>



    <style name="TextAppearance.PackageInstaller.Material.KeepData.SubHeading" parent="@style/TextAppearance.PackageInstaller.BodyMedium">

        <item name="android:textColor">?android:attr/textColorSecondary</item>

        <item name="android:textColor">@color/onSurfaceVariantColor</item>

    </style>



    <style name="TextAppearance.PackageInstaller.Material.Title" parent="@style/TextAppearance.PackageInstaller.HeadlineSmall">

        <item name="android:textColor">@color/onSurfaceColor</item>

    </style>



    <style name="ShapeAppearance">