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

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

Merge "Add some missing Settings and DayNight themes" into mnc-dev

parents 8381e2cd 52003475

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2104,6 +2104,7 @@ package android { 
    field public static final int Theme_Material_DayNight_DarkActionBar = 16974549; // 0x10302d5

    field public static final int Theme_Material_DayNight_Dialog = 16974550; // 0x10302d6

    field public static final int Theme_Material_DayNight_DialogWhenLarge = 16974556; // 0x10302dc

    field public static final int Theme_Material_DayNight_DialogWhenLarge_DarkActionBar = 16974568; // 0x10302e8

    field public static final int Theme_Material_DayNight_DialogWhenLarge_NoActionBar = 16974557; // 0x10302dd

    field public static final int Theme_Material_DayNight_Dialog_Alert = 16974551; // 0x10302d7

    field public static final int Theme_Material_DayNight_Dialog_MinWidth = 16974552; // 0x10302d8
@@ -2128,6 +2129,7 @@ package android { 
    field public static final int Theme_Material_Light_DarkActionBar = 16974392; // 0x1030238

    field public static final int Theme_Material_Light_Dialog = 16974393; // 0x1030239

    field public static final int Theme_Material_Light_DialogWhenLarge = 16974399; // 0x103023f

    field public static final int Theme_Material_Light_DialogWhenLarge_DarkActionBar = 16974567; // 0x10302e7

    field public static final int Theme_Material_Light_DialogWhenLarge_NoActionBar = 16974400; // 0x1030240

    field public static final int Theme_Material_Light_Dialog_Alert = 16974394; // 0x103023a

    field public static final int Theme_Material_Light_Dialog_MinWidth = 16974395; // 0x103023b

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2184,6 +2184,7 @@ package android { 
    field public static final int Theme_Material_DayNight_DarkActionBar = 16974549; // 0x10302d5

    field public static final int Theme_Material_DayNight_Dialog = 16974550; // 0x10302d6

    field public static final int Theme_Material_DayNight_DialogWhenLarge = 16974556; // 0x10302dc

    field public static final int Theme_Material_DayNight_DialogWhenLarge_DarkActionBar = 16974568; // 0x10302e8

    field public static final int Theme_Material_DayNight_DialogWhenLarge_NoActionBar = 16974557; // 0x10302dd

    field public static final int Theme_Material_DayNight_Dialog_Alert = 16974551; // 0x10302d7

    field public static final int Theme_Material_DayNight_Dialog_MinWidth = 16974552; // 0x10302d8
@@ -2208,6 +2209,7 @@ package android { 
    field public static final int Theme_Material_Light_DarkActionBar = 16974392; // 0x1030238

    field public static final int Theme_Material_Light_Dialog = 16974393; // 0x1030239

    field public static final int Theme_Material_Light_DialogWhenLarge = 16974399; // 0x103023f

    field public static final int Theme_Material_Light_DialogWhenLarge_DarkActionBar = 16974567; // 0x10302e7

    field public static final int Theme_Material_Light_DialogWhenLarge_NoActionBar = 16974400; // 0x1030240

    field public static final int Theme_Material_Light_Dialog_Alert = 16974394; // 0x103023a

    field public static final int Theme_Material_Light_Dialog_MinWidth = 16974395; // 0x103023b

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

+5 −0
Original line number Diff line number Diff line
@@ -93,6 +93,11 @@ please see themes_device_defaults.xml. 
         (large, xlarge). -->

    <style name="Theme.Material.DayNight.DialogWhenLarge" parent="Theme.Material.DialogWhenLarge" />



    <!-- Theme for a window with a dark action bar that will be displayed

         either full-screen on smaller screens (small, normal) or as a dialog

         on larger screens (large, xlarge). -->

    <style name="Theme.Material.DayNight.DialogWhenLarge.DarkActionBar" parent="Theme.Material.DialogWhenLarge" />



    <!-- Theme for a window without an action bar that will be displayed either full-screen

         on smaller screens (small, normal) or as a dialog on larger screens

         (large, xlarge). -->

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -2643,6 +2643,8 @@ 
  <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="style" name="Theme.Material.Light.DialogWhenLarge.DarkActionBar" />

  <public type="style" name="Theme.Material.DayNight.DialogWhenLarge.DarkActionBar" />



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

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

core/res/res/values/themes_material.xml

+25 −1
Original line number Diff line number Diff line
@@ -1239,6 +1239,11 @@ please see themes_device_defaults.xml. 
         (large, xlarge). -->

    <style name="Theme.Material.Light.DialogWhenLarge" parent="@style/Theme.Material.Light" />



    <!-- Theme for a window with a dark title bar that will be displayed either

         full-screen on smaller screens (small, normal) or as a dialog on larger screens

         (large, xlarge). -->

    <style name="Theme.Material.Light.DialogWhenLarge.DarkActionBar" parent="@style/Theme.Material.Light.DarkActionBar" />



    <!-- Theme for a window without an action bar that will be displayed either full-screen

         on smaller screens (small, normal) or as a dialog on larger screens

         (large, xlarge). -->
@@ -1283,6 +1288,16 @@ please see themes_device_defaults.xml. 
        <item name="panelMenuListTheme">@style/Theme.Material.Settings.CompactMenu</item>

    </style>



    <!-- Default theme for Settings and activities launched from Settings. -->

    <style name="Theme.Material.Settings.NoActionBar" parent="Theme.Material.DayNight.NoActionBar">

        <item name="colorPrimary">@color/material_blue_grey_900</item>

        <item name="colorPrimaryDark">@color/material_blue_grey_950</item>



        <item name="presentationTheme">@style/Theme.Material.Settings.Dialog.Presentation</item>

        <item name="searchDialogTheme">@style/Theme.Material.Settings.SearchBar</item>

        <item name="panelMenuListTheme">@style/Theme.Material.Settings.CompactMenu</item>

    </style>



    <style name="Theme.Material.Settings.BaseDialog" parent="Theme.Material.DayNight.BaseDialog">

        <item name="colorPrimary">@color/material_blue_grey_900</item>

        <item name="colorPrimaryDark">@color/material_blue_grey_950</item>
@@ -1297,6 +1312,16 @@ please see themes_device_defaults.xml. 


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



    <style name="Theme.Material.Settings.DialogWhenLarge" parent="Theme.Material.DayNight.DialogWhenLarge.DarkActionBar">

        <item name="colorPrimary">@color/material_blue_grey_900</item>

        <item name="colorPrimaryDark">@color/material_blue_grey_950</item>

    </style>



    <style name="Theme.Material.Settings.DialogWhenLarge.NoActionBar" parent="Theme.Material.DayNight.DialogWhenLarge.NoActionBar">

        <item name="colorPrimary">@color/material_blue_grey_900</item>

        <item name="colorPrimaryDark">@color/material_blue_grey_950</item>

    </style>



    <style name="Theme.Material.Settings.Dialog.Presentation" parent="Theme.Material.DayNight.Dialog.Presentation">

        <item name="colorPrimary">@color/material_blue_grey_900</item>

        <item name="colorPrimaryDark">@color/material_blue_grey_950</item>
@@ -1305,7 +1330,6 @@ please see themes_device_defaults.xml. 
    <style name="Theme.Material.Settings.SearchBar" parent="Theme.Material.DayNight.SearchBar">

        <item name="colorPrimary">@color/material_blue_grey_900</item>

        <item name="colorPrimaryDark">@color/material_blue_grey_950</item>

        <item name="colorAccent">@color/material_deep_teal_500</item>

    </style>



    <style name="Theme.Material.Settings.CompactMenu" parent="Theme.Material.DayNight.CompactMenu">