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

Commit 809d5d7f authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "DayNight theme for framework packages" into mnc-dev

parents 4d5c20c6 b9da280a

core/res/AndroidManifest.xml

+11 −10
Original line number Diff line number Diff line
@@ -2451,7 +2451,8 @@ 
                 android:backupAgent="com.android.server.backup.SystemBackupAgent"

                 android:killAfterRestore="false"

                 android:icon="@drawable/ic_launcher_android"

                 android:supportsRtl="true">

                 android:supportsRtl="true"

                 android:theme="@style/Theme.Material.DayNight.DarkActionBar">

        <activity android:name="com.android.internal.app.ChooserActivity"

                android:theme="@style/Theme.DeviceDefault.Resolver"

                android:finishOnCloseSystemDialogs="true"
@@ -2484,7 +2485,7 @@ 
                android:label="@string/managed_profile_label">

        </activity-alias>

        <activity android:name="com.android.internal.app.HeavyWeightSwitcherActivity"

                android:theme="@style/Theme.Material.Light.Dialog"

                android:theme="@style/Theme.Material.DayNight.Dialog"

                android:label="@string/heavy_weight_switcher_title"

                android:finishOnCloseSystemDialogs="true"

                android:excludeFromRecents="true"
@@ -2517,7 +2518,7 @@ 
        <activity android:name="android.accounts.ChooseAccountActivity"

                android:excludeFromRecents="true"

                android:exported="true"

                android:theme="@style/Theme.Material.Light.Dialog"

                android:theme="@style/Theme.Material.DayNight.Dialog"

                android:label="@string/choose_account_label"

                android:process=":ui">

        </activity>
@@ -2525,14 +2526,14 @@ 
        <activity android:name="android.accounts.ChooseTypeAndAccountActivity"

                android:excludeFromRecents="true"

                android:exported="true"

                android:theme="@style/Theme.Material.Light.Dialog"

                android:theme="@style/Theme.Material.DayNight.Dialog"

                android:label="@string/choose_account_label"

                android:process=":ui">

        </activity>



        <activity android:name="android.accounts.ChooseAccountTypeActivity"

                android:excludeFromRecents="true"

                android:theme="@style/Theme.Material.Light.Dialog"

                android:theme="@style/Theme.Material.DayNight.Dialog"

                android:label="@string/choose_account_label"

                android:process=":ui">

        </activity>
@@ -2540,19 +2541,19 @@ 
        <activity android:name="android.accounts.CantAddAccountActivity"

                android:excludeFromRecents="true"

                android:exported="true"

                android:theme="@style/Theme.Material.Light.Dialog.NoActionBar"

                android:theme="@style/Theme.Material.DayNight.Dialog.NoActionBar"

                android:process=":ui">

        </activity>



        <activity android:name="android.accounts.GrantCredentialsPermissionActivity"

                android:excludeFromRecents="true"

                android:exported="true"

                android:theme="@style/Theme.Material.Light.DialogWhenLarge"

                android:theme="@style/Theme.Material.DayNight.DialogWhenLarge"

                android:process=":ui">

        </activity>



        <activity android:name="android.content.SyncActivityTooManyDeletes"

               android:theme="@style/Theme.Material.Light.Dialog"

               android:theme="@style/Theme.Material.DayNight.Dialog"

               android:label="@string/sync_too_many_deletes"

               android:process=":ui">

        </activity>
@@ -2572,13 +2573,13 @@ 
        </activity>



        <activity android:name="com.android.internal.app.NetInitiatedActivity"

                android:theme="@style/Theme.Material.Light.Dialog.Alert"

                android:theme="@style/Theme.Material.DayNight.Dialog.Alert"

                android:excludeFromRecents="true"

                android:process=":ui">

        </activity>



        <activity android:name="com.android.internal.app.RestrictionsPinActivity"

                android:theme="@style/Theme.Material.Light.Dialog.Alert"

                android:theme="@style/Theme.Material.DayNight.Dialog.Alert"

                android:excludeFromRecents="true"

                android:windowSoftInputMode="adjustPan"

                android:process=":ui">

packages/PrintSpooler/res/values/themes.xml

+1 −4
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ 


<resources>



    <style name="PrintActivity" parent="@android:style/Theme.Material">

        <item name="android:colorPrimary">@*android:color/material_blue_grey_900</item>

        <item name="android:colorPrimaryDark">@*android:color/material_blue_grey_950</item>

        <item name="android:colorAccent">@*android:color/material_deep_teal_500</item>

    <style name="PrintActivity" parent="@android:style/Theme.Material.Settings">

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

        <item name="android:windowBackground">@android:color/transparent</item>

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

packages/Shell/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ 


        <activity

            android:name=".BugreportWarningActivity"

            android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"

            android:theme="@*android:style/Theme.Material.DayNight.Dialog.Alert"

            android:finishOnCloseSystemDialogs="true"

            android:excludeFromRecents="true"

            android:exported="false" />

packages/VpnDialogs/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    <application android:label="VpnDialogs"

            android:allowBackup="false" >

        <activity android:name=".ConfirmDialog"

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

                android:theme="@*android:style/Theme.Material.DayNight.Dialog.Alert">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.DEFAULT"/>
@@ -32,7 +32,7 @@ 
        </activity>



        <activity android:name=".ManageDialog"

                android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"

                android:theme="@*android:style/Theme.Material.DayNight.Dialog.Alert"

                android:noHistory="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

packages/WallpaperCropper/res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 
-->



<resources>

    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.DeviceDefault">

    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Material.DayNight">

        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>

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

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

    </style>



    <style name="WallpaperCropperActionBar" parent="android:style/Widget.DeviceDefault.ActionBar">

    <style name="WallpaperCropperActionBar" parent="@android:style/Widget.Material.ActionBar">

        <item name="android:displayOptions">showCustom</item>

        <item name="android:background">#88000000</item>

    </style>