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

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

Merge "Add attribute, theme values for error text color"

parents 62d80aa0 3b496a28

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1291,6 +1291,7 @@ package android { 
    field public static final int textCheckMarkInverse = 16842823; // 0x1010047

    field public static final int textColor = 16842904; // 0x1010098

    field public static final int textColorAlertDialogListItem = 16843526; // 0x1010306

    field public static final int textColorError = 16844100; // 0x1010544

    field public static final int textColorHighlight = 16842905; // 0x1010099

    field public static final int textColorHighlightInverse = 16843599; // 0x101034f

    field public static final int textColorHint = 16842906; // 0x101009a

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1402,6 +1402,7 @@ package android { 
    field public static final int textCheckMarkInverse = 16842823; // 0x1010047

    field public static final int textColor = 16842904; // 0x1010098

    field public static final int textColorAlertDialogListItem = 16843526; // 0x1010306

    field public static final int textColorError = 16844100; // 0x1010544

    field public static final int textColorHighlight = 16842905; // 0x1010099

    field public static final int textColorHighlightInverse = 16843599; // 0x101034f

    field public static final int textColorHint = 16842906; // 0x101009a

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1291,6 +1291,7 @@ package android { 
    field public static final int textCheckMarkInverse = 16842823; // 0x1010047

    field public static final int textColor = 16842904; // 0x1010098

    field public static final int textColorAlertDialogListItem = 16843526; // 0x1010306

    field public static final int textColorError = 16844100; // 0x1010544

    field public static final int textColorHighlight = 16842905; // 0x1010099

    field public static final int textColorHighlightInverse = 16843599; // 0x101034f

    field public static final int textColorHint = 16842906; // 0x101009a

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -131,6 +131,9 @@ 
        <!-- Color of list item text in alert dialogs. -->

        <attr name="textColorAlertDialogListItem" format="reference|color" />



        <!-- Text color for errors. -->

        <attr name="textColorError" format="reference|color" />



        <!-- Search widget more corpus result item background. -->

        <attr name="searchWidgetCorpusItemBackground" format="reference|color" />

core/res/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
    <color name="safe_mode_text">#80ffffff</color>

    <color name="white">#ffffffff</color>

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

    <color name="red">#ffff0000</color>

    <color name="transparent">#00000000</color>

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

    <color name="background_light">#ffffffff</color>