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

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

Merge "Fix dialog overlay theme background color, add theme attr"

parents 1130363f c0653dad

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ package android { 
    field public static final int colorActivatedHighlight = 16843664; // 0x1010390

    field public static final int colorBackground = 16842801; // 0x1010031

    field public static final int colorBackgroundCacheHint = 16843435; // 0x10102ab

    field public static final int colorBackgroundFloating = 16844007; // 0x10104e7

    field public static final int colorButtonNormal = 16843819; // 0x101042b

    field public static final int colorControlActivated = 16843818; // 0x101042a

    field public static final int colorControlHighlight = 16843820; // 0x101042c

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -485,6 +485,7 @@ package android { 
    field public static final int colorActivatedHighlight = 16843664; // 0x1010390

    field public static final int colorBackground = 16842801; // 0x1010031

    field public static final int colorBackgroundCacheHint = 16843435; // 0x10102ab

    field public static final int colorBackgroundFloating = 16844007; // 0x10104e7

    field public static final int colorButtonNormal = 16843819; // 0x101042b

    field public static final int colorControlActivated = 16843818; // 0x101042a

    field public static final int colorControlHighlight = 16843820; // 0x101042c

core/res/res/values/attrs.xml

+3 −1
Original line number Diff line number Diff line
@@ -31,8 +31,10 @@ 
        <attr name="colorForeground" format="color" />

        <!-- Default color of foreground imagery on an inverted background. -->

        <attr name="colorForegroundInverse" format="color" />

        <!-- Color that matches (as closely as possible) the window background. -->

        <!-- Default color of background imagery, ex. full-screen windows. -->

        <attr name="colorBackground" format="color" />

        <!-- Default color of background imagery for floating components, ex. dialogs, popups, and cards. -->

        <attr name="colorBackgroundFloating" format="color" />

        <!-- This is a hint for a solid color that can be used for caching

             rendered views.  This should be the color of the background when

             there is a solid background color; it should be null when the

core/res/res/values/public.xml

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

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



  <!-- Context menu ID for the "Paste as plain text" menu item to to copy the current contents

          of the clipboard into the text view without formatting. -->

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

  <!-- Context menu ID for the "Undo" menu item to undo the last text edit operation. -->

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

  <!-- Context menu ID for the "Redo" menu item to redo the last text edit operation. -->

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



  <!-- TextView attribute to control undo behavior. -->

  <public type="attr" name="allowUndo" />



  <public type="attr" name="colorBackgroundFloating" />



</resources>

core/res/res/values/themes.xml

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ please see themes_device_defaults.xml. 
        <item name="colorForeground">@color/bright_foreground_dark</item>

        <item name="colorForegroundInverse">@color/bright_foreground_dark_inverse</item>

        <item name="colorBackground">@color/background_dark</item>

        <item name="colorBackgroundFloating">?attr/colorBackground</item>

        <item name="colorBackgroundCacheHint">?attr/colorBackground</item>



        <item name="colorPressedHighlight">@color/legacy_pressed_highlight</item>