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

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

Merge "[PM] Do some refacor for PIA V2" into main

parents 2ff92bb8 cfcf8654

packages/PackageInstaller/res/values/strings_v2.xml

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
  -->



<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- TODO(b/274120822): Add product configs for required strings -->



    <!-- Dialog Titles -->

    <string name="title_unknown_source_blocked">Permission required</string>

    <string name="title_install_blocked">Install blocked</string>

packages/PackageInstaller/res/values/styles.xml

+0 −30
Original line number Diff line number Diff line
@@ -16,36 +16,6 @@ 
  -->

<resources>



    <!-- 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: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: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: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: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.Title" parent="@android:style/TextAppearance.DeviceDefault.Headline">

    </style>

packages/PackageInstaller/res/values/themes.xml

+0 −10
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
    </style>



    <style name="Theme.AlertDialogActivity.Material" parent="@style/Theme.Material3.DayNight.Dialog.Alert">

        <!-- TODO (b/274120822): Remove this attribute when we replace all dialogs to MaterialAlertDialog -->

        <item name="android:alertDialogTheme">@style/Theme.MaterialAlertDialog.System</item>

        <item name="android:backgroundDimAmount">@dimen/alert_dialog_dim_amount</item>

        <item name="materialAlertDialogTheme">@style/Theme.MaterialAlertDialog</item>

        <item name="textAppearanceInstallerAppLabel">@style/TextAppearance.PackageInstaller.Material.AppLabel</item>
@@ -41,14 +39,6 @@ 
        <item name="textAppearanceInstallerTitle">@style/TextAppearance.PackageInstaller.Material.Title</item>

    </style>



    <!-- TODO (b/274120822): Remove this theme when we replace all dialogs to MaterialAlertDialog -->

    <style name="Theme.MaterialAlertDialog.System" parent="@style/Theme.AlertDialogActivity">

        <item name="android:buttonBarPositiveButtonStyle">@style/Widget.PackageInstaller.Button.Colored</item>

        <item name="android:buttonBarNegativeButtonStyle">@style/Widget.PackageInstaller.Button.Outlined</item>

        <item name="android:buttonBarStyle">@style/Widget.PackageInstaller.ButtonBar</item>

        <item name="android:windowTitleStyle">@style/Widget.PackageInstaller.WindowTitle</item>

    </style>



    <style name="Theme.MaterialAlertDialog" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog">

        <item name="android:background">@color/surfaceContainerHighColor</item>

        <item name="android:backgroundDimAmount">@dimen/alert_dialog_dim_amount</item>

packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallationFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ public class InstallationFragment extends DialogFragment { 
    @Override

    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

        final InstallStage installStage = getCurrentInstallStage();

        Log.i(LOG_TAG, "Creating " + LOG_TAG + "\n" + installStage);



        // There is no root view here. Ok to pass null view root

        @SuppressWarnings("InflateParams")
@@ -173,6 +172,8 @@ public class InstallationFragment extends DialogFragment { 


        // Get the current install stage

        final InstallStage installStage = getCurrentInstallStage();

        Log.i(LOG_TAG, "updateUI " + LOG_TAG + "\n" + installStage.getStageCode());



        this.setCancelable(true);



        // When A11y is enabled, if there are no buttons in some cases E.g. installing,