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

Commit c2fcc01b authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Add shade 10 to system palette" into sc-dev am: 534b1ea3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14413934

Change-Id: I61ce10996574800e607b43c5fe6ba1c7024060a3
parents 3e41f189 534b1ea3

core/api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -1740,6 +1740,7 @@ package android { 
    field @Deprecated public static final int secondary_text_light = 17170439; // 0x1060007

    field @Deprecated public static final int secondary_text_light_nodisable = 17170440; // 0x1060008

    field public static final int system_accent1_0;

    field public static final int system_accent1_10;

    field public static final int system_accent1_100;

    field public static final int system_accent1_1000;

    field public static final int system_accent1_200;
@@ -1752,6 +1753,7 @@ package android { 
    field public static final int system_accent1_800;

    field public static final int system_accent1_900;

    field public static final int system_accent2_0;

    field public static final int system_accent2_10;

    field public static final int system_accent2_100;

    field public static final int system_accent2_1000;

    field public static final int system_accent2_200;
@@ -1764,6 +1766,7 @@ package android { 
    field public static final int system_accent2_800;

    field public static final int system_accent2_900;

    field public static final int system_accent3_0;

    field public static final int system_accent3_10;

    field public static final int system_accent3_100;

    field public static final int system_accent3_1000;

    field public static final int system_accent3_200;
@@ -1776,6 +1779,7 @@ package android { 
    field public static final int system_accent3_800;

    field public static final int system_accent3_900;

    field public static final int system_neutral1_0;

    field public static final int system_neutral1_10;

    field public static final int system_neutral1_100;

    field public static final int system_neutral1_1000;

    field public static final int system_neutral1_200;
@@ -1788,6 +1792,7 @@ package android { 
    field public static final int system_neutral1_800;

    field public static final int system_neutral1_900;

    field public static final int system_neutral2_0;

    field public static final int system_neutral2_10;

    field public static final int system_neutral2_100;

    field public static final int system_neutral2_1000;

    field public static final int system_neutral2_200;

core/res/remote_color_resources_res/values/colors.xml

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
<resources>

  <!-- Note: the values of the colors doesn't really matter (they will always be overwritten before used), but they help a lot debugging, to find out which color is where in the ARSC file. -->

  <color name="system_accent1_0">#ffffff</color>

  <color name="system_accent1_10">#91fff4</color>

  <color name="system_accent1_50">#91fff4</color>

  <color name="system_accent1_100">#83f6e5</color>

  <color name="system_accent1_200">#65d9c9</color>
@@ -14,6 +15,7 @@ 
  <color name="system_accent1_900">#00271e</color>

  <color name="system_accent1_1000">#000000</color>

  <color name="system_accent2_0">#ffffff</color>

  <color name="system_accent2_10">#ffffff</color>

  <color name="system_accent2_50">#91fff4</color>

  <color name="system_accent2_100">#83f6e5</color>

  <color name="system_accent2_200">#65d9c9</color>
@@ -26,6 +28,7 @@ 
  <color name="system_accent2_900">#00271e</color>

  <color name="system_accent2_1000">#000000</color>

  <color name="system_accent3_0">#ffffff</color>

  <color name="system_accent3_10">#91fff4</color>

  <color name="system_accent3_50">#91fff4</color>

  <color name="system_accent3_100">#83f6e5</color>

  <color name="system_accent3_200">#65d9c9</color>
@@ -38,6 +41,7 @@ 
  <color name="system_accent3_900">#00271e</color>

  <color name="system_accent3_1000">#000000</color>

  <color name="system_neutral1_0">#ffffff</color>

  <color name="system_neutral1_10">#f0f0f0</color>

  <color name="system_neutral1_50">#f0f0f0</color>

  <color name="system_neutral1_100">#e2e2e2</color>

  <color name="system_neutral1_200">#c6c6c6</color>
@@ -50,6 +54,7 @@ 
  <color name="system_neutral1_900">#1b1b1b</color>

  <color name="system_neutral1_1000">#000000</color>

  <color name="system_neutral2_0">#ffffff</color>

  <color name="system_neutral2_10">#f0f0f0</color>

  <color name="system_neutral2_50">#f0f0f0</color>

  <color name="system_neutral2_100">#e2e2e2</color>

  <color name="system_neutral2_200">#c6c6c6</color>

core/res/remote_color_resources_res/values/public.xml

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
<resources>

  <public-group type="color" first-id="0x0106001d">

    <public name="system_accent1_0" />

    <public name="system_accent1_10" />

    <public name="system_accent1_50" />

    <public name="system_accent1_100" />

    <public name="system_accent1_200" />
@@ -14,6 +15,7 @@ 
    <public name="system_accent1_900" />

    <public name="system_accent1_1000" />

    <public name="system_accent2_0" />

    <public name="system_accent2_10" />

    <public name="system_accent2_50" />

    <public name="system_accent2_100" />

    <public name="system_accent2_200" />
@@ -26,6 +28,7 @@ 
    <public name="system_accent2_900" />

    <public name="system_accent2_1000" />

    <public name="system_accent3_0" />

    <public name="system_accent3_10" />

    <public name="system_accent3_50" />

    <public name="system_accent3_100" />

    <public name="system_accent3_200" />
@@ -38,6 +41,7 @@ 
    <public name="system_accent3_900" />

    <public name="system_accent3_1000" />

    <public name="system_neutral1_0" />

    <public name="system_neutral1_10" />

    <public name="system_neutral1_50" />

    <public name="system_neutral1_100" />

    <public name="system_neutral1_200" />
@@ -50,6 +54,7 @@ 
    <public name="system_neutral1_900" />

    <public name="system_neutral1_1000" />

    <public name="system_neutral2_0" />

    <public name="system_neutral2_10" />

    <public name="system_neutral2_50" />

    <public name="system_neutral2_100" />

    <public name="system_neutral2_200" />

core/res/res/values/colors.xml

+15 −0
Original line number Diff line number Diff line
@@ -246,6 +246,9 @@ 
    <!-- Lightest shade of the accent color used by the system. White.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_accent1_0">#ffffff</color>

    <!-- Shade of the accent system color at 99% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_accent1_10">#F1FFFC</color>

    <!-- Shade of the accent system color at 95% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_accent1_50">#9CFFF2</color>
@@ -283,6 +286,9 @@ 
    <!-- Lightest shade of the secondary accent color used by the system. White.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_accent2_0">#ffffff</color>

    <!-- Shade of the secondary accent system color at 99% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_accent2_10">#F0FFFC</color>

    <!-- Shade of the secondary accent system color at 95% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_accent2_50">#CDFAF1</color>
@@ -320,6 +326,9 @@ 
    <!-- Lightest shade of the tertiary accent color used by the system. White.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_accent3_0">#ffffff</color>

    <!-- Shade of the tertiary accent system color at 99% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_accent3_10">#FFFBFF</color>

    <!-- Shade of the tertiary accent system color at 95% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_accent3_50">#F9EAFF</color>
@@ -357,6 +366,9 @@ 
    <!-- Lightest shade of the neutral color used by the system. White.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_neutral1_0">#ffffff</color>

    <!-- Shade of the neutral system color at 99% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_neutral1_10">#fbfbfb</color>

    <!-- Shade of the neutral system color at 95% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_neutral1_50">#f0f0f0</color>
@@ -394,6 +406,9 @@ 
    <!-- Lightest shade of the secondary neutral color used by the system. White.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_neutral2_0">#ffffff</color>

    <!-- Shade of the secondary neutral system color at 99% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_neutral2_10">#fbfbfb</color>

    <!-- Shade of the secondary neutral system color at 95% lightness.

     This value can be overlaid at runtime by OverlayManager RROs. -->

    <color name="system_neutral2_50">#f0f0f0</color>

core/res/res/values/public.xml

+5 −0
Original line number Diff line number Diff line
@@ -3111,6 +3111,7 @@ 
    <!-- Material design dynamic system palette:-->

    <!-- Neutral colors for background and text -->

    <public name="system_neutral1_0" />

    <public name="system_neutral1_10" />

    <public name="system_neutral1_50" />

    <public name="system_neutral1_100" />

    <public name="system_neutral1_200" />
@@ -3123,6 +3124,7 @@ 
    <public name="system_neutral1_900" />

    <public name="system_neutral1_1000" />

    <public name="system_neutral2_0" />

    <public name="system_neutral2_10" />

    <public name="system_neutral2_50" />

    <public name="system_neutral2_100" />

    <public name="system_neutral2_200" />
@@ -3136,6 +3138,7 @@ 
    <public name="system_neutral2_1000" />

    <!-- Accent colors, for buttons and UI decorations -->

    <public name="system_accent1_0" />

    <public name="system_accent1_10" />

    <public name="system_accent1_50" />

    <public name="system_accent1_100" />

    <public name="system_accent1_200" />
@@ -3148,6 +3151,7 @@ 
    <public name="system_accent1_900" />

    <public name="system_accent1_1000" />

    <public name="system_accent2_0" />

    <public name="system_accent2_10" />

    <public name="system_accent2_50" />

    <public name="system_accent2_100" />

    <public name="system_accent2_200" />
@@ -3160,6 +3164,7 @@ 
    <public name="system_accent2_900" />

    <public name="system_accent2_1000" />

    <public name="system_accent3_0" />

    <public name="system_accent3_10" />

    <public name="system_accent3_50" />

    <public name="system_accent3_100" />

    <public name="system_accent3_200" />