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

Commit 923ec4ff authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Dark version of error/crash dialogs"

parents 14e55e49 332d34fa

core/res/res/values-night/themes_device_defaults.xml

+3 −0
Original line number Diff line number Diff line
@@ -51,4 +51,7 @@ easier. 
          -->

    <!-- DeviceDefault theme for a window that should look like the Settings app.  -->

    <style name="Theme.DeviceDefault.Settings" parent="Theme.DeviceDefault"/>



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

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

</resources>

core/res/res/values-television/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

<resources>

    <style name="Theme.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />

    <style name="Theme.Dialog.AppError" parent="Theme.Leanback.Dialog.AppError" />

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

    <style name="Theme.Holo.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" />

    <style name="Theme.Holo.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />

    <style name="Theme.Material.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" />

core/res/res/values-watch/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

<resources>

    <!-- Theme for the dialog shown when an app crashes or ANRs. Override to make it dark. -->

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

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

        <item name="windowContentTransitions">false</item>

        <item name="windowActivityTransitions">false</item>

        <item name="windowCloseOnTouchOutside">false</item>

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -2099,7 +2099,7 @@ 
  <java-symbol type="string" name="vpn_lockdown_error" />

  <java-symbol type="string" name="vpn_lockdown_config" />

  <java-symbol type="string" name="wallpaper_binding_label" />

  <java-symbol type="style" name="Theme.Dialog.AppError" />

  <java-symbol type="style" name="Theme.DeviceDefault.Dialog.AppError" />

  <java-symbol type="style" name="Theme.Leanback.Dialog.Alert" />

  <java-symbol type="style" name="Theme.Toast" />

  <java-symbol type="xml" name="storage_list" />

core/res/res/values/themes.xml

+0 −7
Original line number Diff line number Diff line
@@ -869,13 +869,6 @@ please see themes_device_defaults.xml. 
    <!-- System themes -->

    <eat-comment />



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

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

        <item name="windowContentTransitions">false</item>

        <item name="windowActivityTransitions">false</item>

        <item name="windowCloseOnTouchOutside">false</item>

    </style>



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

         with overlays. -->

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