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

Commit 3c30acf6 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Add theme for light status bar"

parents 8561ff98 4c8dfb48

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2120,6 +2120,7 @@ package android { 
    field public static final int Theme_Material_Light_Dialog_NoActionBar = 16974396; // 0x103023c

    field public static final int Theme_Material_Light_Dialog_NoActionBar_MinWidth = 16974397; // 0x103023d

    field public static final int Theme_Material_Light_Dialog_Presentation = 16974398; // 0x103023e

    field public static final int Theme_Material_Light_LightStatusBar = 16974563; // 0x10302e3

    field public static final int Theme_Material_Light_NoActionBar = 16974401; // 0x1030241

    field public static final int Theme_Material_Light_NoActionBar_Fullscreen = 16974402; // 0x1030242

    field public static final int Theme_Material_Light_NoActionBar_Overscan = 16974403; // 0x1030243

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2199,6 +2199,7 @@ package android { 
    field public static final int Theme_Material_Light_Dialog_NoActionBar = 16974396; // 0x103023c

    field public static final int Theme_Material_Light_Dialog_NoActionBar_MinWidth = 16974397; // 0x103023d

    field public static final int Theme_Material_Light_Dialog_Presentation = 16974398; // 0x103023e

    field public static final int Theme_Material_Light_LightStatusBar = 16974563; // 0x10302e3

    field public static final int Theme_Material_Light_NoActionBar = 16974401; // 0x1030241

    field public static final int Theme_Material_Light_NoActionBar_Fullscreen = 16974402; // 0x1030242

    field public static final int Theme_Material_Light_NoActionBar_Overscan = 16974403; // 0x1030243

core/res/res/values/colors_material.xml

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
    <color name="primary_material_light">#ffefefef</color>

    <color name="primary_dark_material_dark">#ff000000</color>

    <color name="primary_dark_material_light">#ff757575</color>

    <color name="primary_dark_material_light_light_status_bar">#ffe0e0e0</color>



    <!-- 26% white (foreground) -->

    <color name="ripple_material_dark">#42ffffff</color>

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2632,5 +2632,6 @@ 
  <public type="style" name="Theme.Material.DayNight.NoActionBar.Overscan" />

  <public type="style" name="Theme.Material.DayNight.NoActionBar.TranslucentDecor" />

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

  <public type="style" name="Theme.Material.Light.LightStatusBar" />



</resources>

core/res/res/values/themes_material.xml

+7 −0
Original line number Diff line number Diff line
@@ -754,6 +754,13 @@ please see themes_device_defaults.xml. 
        <item name="colorPrimary">@color/primary_material_dark</item>

    </style>



    <!-- Variant of the material (light) theme that has a light status bar background with dark

         status bar contents. -->

    <style name="Theme.Material.Light.LightStatusBar">

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

        <item name="windowHasLightStatusBar">true</item>

    </style>



    <style name="ThemeOverlay" />

    <style name="ThemeOverlay.Material" />