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

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

Merge "Restore windowMinWidthMajor/Minor in alert dialog overlay theme"

parents d3c1ddb8 614b9563

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2026,6 +2026,7 @@ package android { 
    field public static final int ThemeOverlay_Material_Dark = 16974411; // 0x103024b

    field public static final int ThemeOverlay_Material_Dark_ActionBar = 16974412; // 0x103024c

    field public static final int ThemeOverlay_Material_Dialog = 16974564; // 0x10302e4

    field public static final int ThemeOverlay_Material_Dialog_Alert = 16974566; // 0x10302e6

    field public static final int ThemeOverlay_Material_Light = 16974410; // 0x103024a

    field public static final int Theme_Black = 16973832; // 0x1030008

    field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2105,6 +2105,7 @@ package android { 
    field public static final int ThemeOverlay_Material_Dark = 16974411; // 0x103024b

    field public static final int ThemeOverlay_Material_Dark_ActionBar = 16974412; // 0x103024c

    field public static final int ThemeOverlay_Material_Dialog = 16974564; // 0x10302e4

    field public static final int ThemeOverlay_Material_Dialog_Alert = 16974566; // 0x10302e6

    field public static final int ThemeOverlay_Material_Light = 16974410; // 0x103024a

    field public static final int Theme_Black = 16973832; // 0x1030008

    field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2642,6 +2642,7 @@ 
  <public type="style" name="Theme.Material.Light.LightStatusBar" />

  <public type="style" name="ThemeOverlay.Material.Dialog" />

  <public type="style" name="TextAppearance.Material.Widget.Button.Inverse" />

  <public type="style" name="ThemeOverlay.Material.Dialog.Alert" />



  <public type="id" name="pasteAsPlainText" />

  <public type="id" name="undo" />

core/res/res/values/themes_material.xml

+7 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ please see themes_device_defaults.xml. 
        <item name="dialogPreferredPadding">@dimen/dialog_padding_material</item>



        <!-- AlertDialog attributes -->

        <item name="alertDialogTheme">@style/ThemeOverlay.Material.Dialog</item>

        <item name="alertDialogTheme">@style/ThemeOverlay.Material.Dialog.Alert</item>

        <item name="alertDialogStyle">@style/AlertDialog.Material</item>

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

        <item name="alertDialogIcon">@drawable/ic_dialog_alert_material</item>
@@ -538,7 +538,7 @@ please see themes_device_defaults.xml. 
        <item name="dialogPreferredPadding">@dimen/dialog_padding_material</item>



        <!-- AlertDialog attributes -->

        <item name="alertDialogTheme">@style/ThemeOverlay.Material.Dialog</item>

        <item name="alertDialogTheme">@style/ThemeOverlay.Material.Dialog.Alert</item>

        <item name="alertDialogStyle">@style/AlertDialog.Material.Light</item>

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

        <item name="alertDialogIcon">@drawable/ic_dialog_alert_material</item>
@@ -882,6 +882,11 @@ please see themes_device_defaults.xml. 
        <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item>

    </style>



    <style name="ThemeOverlay.Material.Dialog.Alert">

        <item name="windowMinWidthMajor">@dimen/dialog_min_width_major</item>

        <item name="windowMinWidthMinor">@dimen/dialog_min_width_minor</item>

    </style>



    <!-- Variant of the material (dark) theme with no action bar. -->

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

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