commit 3e24ffd20862f651a059ee4b966d40d9c81334fa
author Philip P. Moltmann <moltmann@google.com> Tue Dec 18 16:38:23 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 18 16:38:23 2018 +0000
tree 85b64004a98a95eb078c266994c54b43469173d0
parent 126a2d2cd0e0cfe9f2312fb97fd182be48ca6e67
parent f84bde6c1517f040ceccd8b4e1a0eb9a534c7196

Merge "Add system_notification_accent_color for mainline"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 7d10b098..8f5ccd1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -205,6 +205,10 @@
     field public static final int config_sendPackageName = 17891328; // 0x1110000
   }
 
+  public static final class R.color {
+    field public static final int system_notification_accent_color = 17170460; // 0x106001c
+  }
+
   public static final class R.dimen {
     field public static final int config_mediaMetadataBitmapMaxSize = 17104904; // 0x1050008
     field public static final int config_restrictedIconSize = 17104903; // 0x1050007

core/res/res/values/public.xml

diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 6f75d90..799d9d8 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2978,6 +2978,11 @@
         <public name="config_mediaMetadataBitmapMaxSize" />
     </public-group>
 
+    <public-group type="color" first-id="0x0106001c">
+        <!-- @hide @SystemApi -->
+        <public name="system_notification_accent_color" />
+    </public-group>
+
   <!-- ===============================================================
        DO NOT ADD UN-GROUPED ITEMS HERE