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

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

Merge changes Ia9fad51e,I8d8aef07,I5a152630 into main 

* changes:
  [PM] Support material progressbar
  [pm] Use a flag to enable PIA V2 material design
  [PM] Add config to enable / disable the pia material
parents 568155ad d2e0e51e

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -493,6 +493,7 @@ package android { 
  public static final class R.bool {

    field public static final int config_enableDefaultNotes = 17891338; // 0x111000a

    field public static final int config_enableDefaultNotesForWorkProfile = 17891339; // 0x111000b

    field @FlaggedApi("android.content.pm.use_pia_v2") public static final int config_enableMaterialDesignInPackageInstaller;

    field public static final int config_enableQrCodeScannerOnLockScreen = 17891336; // 0x1110008

    field public static final int config_safetyProtectionEnabled = 17891337; // 0x1110009

    field public static final int config_sendPackageName = 17891328; // 0x1110000

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -7576,4 +7576,7 @@ 


    <!-- Package name for verification service provider app [DO NOT TRANSLATE] -->

    <string name="config_verificationServiceProviderPackageName" translatable="false" />



    <!-- Whether the system package installer supports the material design. -->

    <bool name="config_enableMaterialDesignInPackageInstaller">true</bool>

</resources>

core/res/res/values/public-staging.xml

+3 −0
Original line number Diff line number Diff line
@@ -288,6 +288,9 @@ 
  </staging-public-group>



  <staging-public-group type="bool" first-id="0x01a30000">

    <!-- @FlaggedApi(android.content.pm.Flags.FLAG_USE_PIA_V2)

        @hide @SystemApi -->

    <public name="config_enableMaterialDesignInPackageInstaller" />

  </staging-public-group>



  <staging-public-group type="fraction" first-id="0x01a20000">

packages/PackageInstaller/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ java_defaults { 
        "androidx.leanback_leanback",

        "androidx.lifecycle_lifecycle-extensions",

        "androidx.lifecycle_lifecycle-livedata",

        "com.google.android.material_material",

        "kotlin-parcelize-runtime",

    ],
@@ -62,6 +63,10 @@ java_defaults { 
        error_checks: ["Recycle"],

    },

    kotlin_plugins: ["kotlin-parcelize-compiler-plugin"],



    optimize: {

        shrink_resources: true,

    },

}



android_app {

packages/PackageInstaller/res/layout/install_fragment_material_layout.xml

0 → 100644
+43 −0
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.

  -->



<LinearLayout 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">



    <include layout="@layout/app_snippet_layout" />



    <com.google.android.material.progressindicator.LinearProgressIndicator

        android:id="@+id/progress_bar"

        android:indeterminate="true"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_marginTop="@dimen/dialog_inter_element_margin"

        android:paddingVertical="4dp"

        android:visibility="gone" />



    <TextView

        style="@style/Widget.PackageInstaller.TextView.CustomMessage"

        android:id="@+id/custom_message"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_marginTop="@dimen/dialog_inter_element_margin"

        android:visibility="gone" />



</LinearLayout>