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

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

Merge "[PM] Refactor the themes for PIA V2" into main

parents 433d403f 5a0ee3b8

packages/PackageInstaller/AndroidManifest.xml

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


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

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:exported="false"

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

            android:exported="false"/>



        <activity android:name=".InstallStart"

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

            android:excludeFromRecents="true"

            android:noHistory="true"

            android:exported="false"

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

        </activity>

            android:exported="false" />



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

            android:permission="android.permission.INSTALL_PACKAGES"
@@ -180,7 +177,6 @@ 


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

            android:configChanges="orientation|keyboardHidden|screenSize"

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

            android:exported="false"/>

    </application>

packages/PackageInstaller/res/values-night/styles.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<!--

  ~ 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.

  -->

<resources>



    <style name="Theme.PackageInstaller.AlertDialog" parent="@android:style/Theme.DeviceDefault.Dialog.Alert">

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

</resources>

packages/PackageInstaller/res/values-night/themes.xml

+0 −6
Original line number Diff line number Diff line
@@ -24,10 +24,4 @@ 
        <item name="android:windowAnimationStyle">@null</item>

    </style>



    <style name="Theme.PackageInstaller"

        parent="@android:style/Theme.DeviceDefault.Dialog.Alert">

        <item name="android:alertDialogTheme">@style/Theme.PackageInstaller.AlertDialog</item>

        <item name="android:windowNoTitle">true</item>

    </style>



</resources>

packages/PackageInstaller/res/values/styles.xml

+0 −12
Original line number Diff line number Diff line
@@ -16,18 +16,6 @@ 
  -->

<resources>



    <style name="Theme.PackageInstaller.AlertDialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">

        <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.PackageInstaller.AlertDialog.Variant">

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

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

    </style>



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

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

        <item name="android:background">@null</item>

packages/PackageInstaller/res/values/themes.xml

+14 −4
Original line number Diff line number Diff line
@@ -24,10 +24,20 @@ 
        <item name="android:windowAnimationStyle">@null</item>

    </style>



    <style name="Theme.PackageInstaller"

        parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">

        <item name="android:alertDialogTheme">@style/Theme.PackageInstaller.AlertDialog</item>

        <item name="android:windowNoTitle">true</item>

    <style name="Theme.AlertDialogActivity.Material" >

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

    </style>



    <style name="Theme.MaterialAlertDialog" 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.Variant">

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

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

    </style>



</resources>