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

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

Merge "Remove icon from base alert dialog, use light theme"

parents 30303fae c65ff211

core/res/res/values/themes.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -816,7 +816,7 @@ please see themes_device_defaults.xml. 
    <eat-comment />

    <eat-comment />





    <!-- Theme for the dialog shown when an app crashes or ANRs. -->

    <!-- Theme for the dialog shown when an app crashes or ANRs. -->

    <style name="Theme.Dialog.AppError" parent="Theme.DeviceDefault.Dialog">

    <style name="Theme.Dialog.AppError" parent="Theme.DeviceDefault.Light.Dialog">

        <item name="windowFrame">@null</item>

        <item name="windowFrame">@null</item>

        <item name="windowTitleStyle">@style/DialogWindowTitle</item>

        <item name="windowTitleStyle">@style/DialogWindowTitle</item>

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

        <item name="windowBackground">@color/transparent</item>
@@ -829,7 +829,7 @@ please see themes_device_defaults.xml. 




    <!-- Special theme for the recent apps dialog, to allow customization

    <!-- Special theme for the recent apps dialog, to allow customization

         with overlays. -->

         with overlays. -->

    <style name="Theme.Dialog.RecentApplications" parent="Theme.DeviceDefault.Dialog">

    <style name="Theme.Dialog.RecentApplications" parent="Theme.DeviceDefault.Light.Dialog">

        <item name="windowFrame">@null</item>

        <item name="windowFrame">@null</item>

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

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

        <item name="windowAnimationStyle">@style/Animation.RecentApplications</item>

        <item name="windowAnimationStyle">@style/Animation.RecentApplications</item>

services/core/java/com/android/server/am/BaseErrorDialog.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ class BaseErrorDialog extends AlertDialog { 
        WindowManager.LayoutParams attrs = getWindow().getAttributes();

        WindowManager.LayoutParams attrs = getWindow().getAttributes();

        attrs.setTitle("Error Dialog");

        attrs.setTitle("Error Dialog");

        getWindow().setAttributes(attrs);

        getWindow().setAttributes(attrs);

        setIconAttribute(R.attr.alertDialogIcon);

    }

    }





    public void onStart() {

    public void onStart() {