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

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

Merge changes I66cc9e5d,I64c4d797 into main 

* changes:
  [PM] Support better transition in PIA V2 (2/N)
  [PM] Support better transition in PIA V2 (1/N)
parents d4fca214 eb773963

packages/PackageInstaller/res/layout/anonymous_material_layout.xml

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  Copyright (C) 2025 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:orientation="vertical"

    android:paddingHorizontal="?android:attr/dialogPreferredPadding"

    android:paddingBottom="@dimen/alert_dialog_inner_padding"

    android:paddingTop="@dimen/alert_dialog_inner_padding">



    <TextView

        style="?attr/textAppearanceInstallerCustomMessage"

        android:id="@+id/custom_message"

        android:layout_height="wrap_content"

        android:layout_width="match_parent" />



</ScrollView>

packages/PackageInstaller/res/values/dimens.xml

+4 −4
Original line number Diff line number Diff line
@@ -53,9 +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.6</dimen>

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

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

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

    <dimen name="alert_dialog_min_width_minor">96.5%</dimen>

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

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

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

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

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

</resources>

packages/PackageInstaller/res/values/styles.xml

+6 −6
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ 


    <!-- Material design -->

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

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

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

    </style>
@@ -80,7 +79,8 @@ 
    </style>



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

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

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

        <item name="android:insetTop">4dp</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>
@@ -88,8 +88,8 @@ 
    </style>



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

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

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

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

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

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

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

        <item name="android:paddingHorizontal">16dp</item>
@@ -99,8 +99,8 @@ 
    </style>



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

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

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

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

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

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

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

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

packages/PackageInstaller/res/values/themes.xml

+0 −5
Original line number Diff line number Diff line
@@ -60,11 +60,6 @@ 
        <item name="shapeAppearanceOverlay">@style/ShapeAppearance</item>

    </style>



    <style name="Theme.MaterialAlertDialog.Variant" parent="">

        <item name="buttonBarPositiveButtonStyle">@style/Widget.PackageInstaller.Material.Button</item>

        <item name="buttonBarNegativeButtonStyle">@style/Widget.PackageInstaller.Material.Button</item>

    </style>



    <style name="Theme.UninstallerActivity"

        parent="@style/Theme.AlertDialogActivity">

    </style>

packages/PackageInstaller/src/com/android/packageinstaller/v2/model/PackageUtil.kt

+6 −19
Original line number Diff line number Diff line
@@ -54,28 +54,14 @@ object PackageUtil { 
    const val localLogv = false



    const val ARGS_ABORT_REASON: String = "abort_reason"

    const val ARGS_ACTION_REASON: String = "action_reason"

    const val ARGS_ACTIVITY_RESULT_CODE: String = "activity_result_code"

    const val ARGS_APP_DATA_SIZE: String = "app_data_size"

    const val ARGS_APP_LABEL: String = "app_label"

    const val ARGS_APP_SNIPPET: String = "app_snippet"

    const val ARGS_BUTTON_TEXT: String = "button_text"

    const val ARGS_ERROR_DIALOG_TYPE: String = "error_dialog_type"

    const val ARGS_EXISTING_OWNER: String = "existing_owner"

    const val ARGS_INSTALLER_LABEL: String = "installer_label"

    const val ARGS_INSTALLER_PACKAGE: String = "installer_pkg"

    const val ARGS_IS_ARCHIVE: String = "is_archive"

    const val ARGS_IS_CLONE_USER: String = "clone_user"

    const val ARGS_IS_UPDATING: String = "is_updating"

    const val ARGS_LEGACY_CODE: String = "legacy_code"

    const val ARGS_MESSAGE: String = "message"

    const val ARGS_NEW_OWNER: String = "new_owner"

    const val ARGS_PENDING_INTENT: String = "pending_intent"

    const val ARGS_REQUIRED_BYTES: String = "required_bytes"

    const val ARGS_RESULT_INTENT: String = "result_intent"

    const val ARGS_SHOULD_RETURN_RESULT: String = "should_return_result"

    const val ARGS_SOURCE_PKG: String = "source_pkg"

    const val ARGS_STATUS_CODE: String = "status_code"

    const val ARGS_TITLE: String = "title"

    const val ARGS_UNARCHIVAL_STATUS: String = "unarchival_status"
@@ -519,7 +505,8 @@ object PackageUtil { 
    fun isMaterialDesignEnabled(context: Context): Boolean {

        return android.content.pm.Flags.usePiaV2()

                && context.resources.getBoolean(

            android.R.bool.config_enableMaterialDesignInPackageInstaller)

            android.R.bool.config_enableMaterialDesignInPackageInstaller

        )

    }



    /**