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

Commit f665799b authored by Sumedh Sen's avatar Sumedh Sen Committed by Android (Google) Code Review
Browse files

Merge changes from topic "piav2-ui" into main 

* changes:
  Simplify how we compute strings for uninstalling from profiles and other users
  Implement new UI for Uninstall dialogs
  Implement Reinstall dialogs in new UI
  Implement update ownership for new UI
  Update Pia to new UI using Material themes
parents 46f4150c 82588a8d

packages/PackageInstaller/Android.bp

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

        "androidx.lifecycle_lifecycle-extensions",

        "androidx.lifecycle_lifecycle-livedata",

        "com.google.android.material_material",

        "kotlin-parcelize-runtime",

    ],
@@ -89,6 +90,7 @@ android_app { 
        "androidx.leanback_leanback",

        "androidx.lifecycle_lifecycle-extensions",

        "androidx.lifecycle_lifecycle-livedata",

        "com.google.android.material_material",

        "kotlin-parcelize-runtime",

    ],

    aaptflags: ["--product tablet"],
@@ -124,6 +126,7 @@ android_app { 
        "androidx.leanback_leanback",

        "androidx.lifecycle_lifecycle-extensions",

        "androidx.lifecycle_lifecycle-livedata",

        "com.google.android.material_material",

        "kotlin-parcelize-runtime",

    ],

    aaptflags: ["--product tv"],

packages/PackageInstaller/AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ 


        <activity android:name=".v2.ui.InstallLaunch"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:exported="false"/>

            android:exported="false"

            android:theme="@style/Theme.PackageInstaller"/>



        <activity android:name=".InstallStart"

                android:exported="true"
@@ -120,7 +121,8 @@ 
            android:configChanges="orientation|keyboardHidden|screenSize"

            android:excludeFromRecents="true"

            android:noHistory="true"

            android:exported="false">

            android:exported="false"

            android:theme="@style/Theme.PackageInstaller">

        </activity>



        <receiver android:name=".common.UninstallEventReceiver"

packages/PackageInstaller/res/drawable/background_colored_button.xml

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

  ~

  ~      https://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.

  -->

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

    <shape android:shape="rectangle">

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

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

    </shape>

</inset>

packages/PackageInstaller/res/drawable/background_outlined_button.xml

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

  ~

  ~      https://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.

  -->



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

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

    <stroke

        android:width="1dp"

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

</shape>

packages/PackageInstaller/res/drawable/lock_24px.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960">

  <path

      android:fillColor="?android:attr/colorPrimary"

      android:pathData="M240,880Q207,880 183.5,856.5Q160,833 160,800L160,400Q160,367 183.5,343.5Q207,320 240,320L280,320L280,240Q280,157 338.5,98.5Q397,40 480,40Q563,40 621.5,98.5Q680,157 680,240L680,320L720,320Q753,320 776.5,343.5Q800,367 800,400L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM240,800L720,800Q720,800 720,800Q720,800 720,800L720,400Q720,400 720,400Q720,400 720,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800ZM480,680Q513,680 536.5,656.5Q560,633 560,600Q560,567 536.5,543.5Q513,520 480,520Q447,520 423.5,543.5Q400,567 400,600Q400,633 423.5,656.5Q447,680 480,680ZM360,320L600,320L600,240Q600,190 565,155Q530,120 480,120Q430,120 395,155Q360,190 360,240L360,320ZM240,800Q240,800 240,800Q240,800 240,800L240,400Q240,400 240,400Q240,400 240,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800Z"/>

</vector>