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

Commit cd10a1fc authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge \"Add colorSecondary theme attribute.\" into nyc-mr1-dev am:... 

Merge "Merge \"Add colorSecondary theme attribute.\" into nyc-mr1-dev am: ddb980de" into nyc-mr1-dev-plus-aosp
parents bcc13530 d861ae98

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ package android { 
    field public static final int colorPressedHighlight = 16843661; // 0x101038d

    field public static final int colorPrimary = 16843827; // 0x1010433

    field public static final int colorPrimaryDark = 16843828; // 0x1010434

    field public static final int colorSecondary = 16844080; // 0x1010530

    field public static final int columnCount = 16843639; // 0x1010377

    field public static final int columnDelay = 16843215; // 0x10101cf

    field public static final int columnOrderPreserved = 16843640; // 0x1010378

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ package android { 
    field public static final int colorPressedHighlight = 16843661; // 0x101038d

    field public static final int colorPrimary = 16843827; // 0x1010433

    field public static final int colorPrimaryDark = 16843828; // 0x1010434

    field public static final int colorSecondary = 16844080; // 0x1010530

    field public static final int columnCount = 16843639; // 0x1010377

    field public static final int columnDelay = 16843215; // 0x10101cf

    field public static final int columnOrderPreserved = 16843640; // 0x1010378

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ package android { 
    field public static final int colorPressedHighlight = 16843661; // 0x101038d

    field public static final int colorPrimary = 16843827; // 0x1010433

    field public static final int colorPrimaryDark = 16843828; // 0x1010434

    field public static final int colorSecondary = 16844080; // 0x1010530

    field public static final int columnCount = 16843639; // 0x1010377

    field public static final int columnDelay = 16843215; // 0x10101cf

    field public static final int columnOrderPreserved = 16843640; // 0x1010378

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -1048,6 +1048,9 @@ i 
             the status bar (via statusBarColor) and navigation bar (via navigationBarColor). -->

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



        <!-- The secondary branding color for the app. -->

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



        <!-- Bright complement to the primary branding color. By default, this is the color applied

             to framework controls (via colorControlActivated). -->

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

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2741,5 +2741,6 @@ 
    <public type="attr" name="contextUri" />

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

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

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



</resources>