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

Commit c11df252 authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

Add colorSecondary theme attribute. 

Value is defined only for .Settings themes.

Uses new attribute in SystemUI to set the switch bar background in
System UI Tuner and the edit UI background in Quick Settings.

BUG: 28625050
Change-Id: I840597670fb8826c7e2172c933ff618e52fc9ac1
FIXES: 28625105
FIXES: 29003223
parent b84b3e6d

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>