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

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

Merge "Update system palette APIs" into sc-dev am: c1615dff 

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

Change-Id: Id984b0e67377ef38359d33ff735d7921794037c2
parents fc5ff039 c1615dff

core/api/current.txt

+60 −36
Original line number Diff line number Diff line
@@ -1729,42 +1729,66 @@ package android { 
    field @Deprecated public static final int secondary_text_dark_nodisable = 17170438; // 0x1060006

    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_neutral_0 = 17170485; // 0x1060035

    field public static final int system_neutral_100 = 17170487; // 0x1060037

    field public static final int system_neutral_1000 = 17170496; // 0x1060040

    field public static final int system_neutral_200 = 17170488; // 0x1060038

    field public static final int system_neutral_300 = 17170489; // 0x1060039

    field public static final int system_neutral_400 = 17170490; // 0x106003a

    field public static final int system_neutral_50 = 17170486; // 0x1060036

    field public static final int system_neutral_500 = 17170491; // 0x106003b

    field public static final int system_neutral_600 = 17170492; // 0x106003c

    field public static final int system_neutral_700 = 17170493; // 0x106003d

    field public static final int system_neutral_800 = 17170494; // 0x106003e

    field public static final int system_neutral_900 = 17170495; // 0x106003f

    field public static final int system_primary_0 = 17170461; // 0x106001d

    field public static final int system_primary_100 = 17170463; // 0x106001f

    field public static final int system_primary_1000 = 17170472; // 0x1060028

    field public static final int system_primary_200 = 17170464; // 0x1060020

    field public static final int system_primary_300 = 17170465; // 0x1060021

    field public static final int system_primary_400 = 17170466; // 0x1060022

    field public static final int system_primary_50 = 17170462; // 0x106001e

    field public static final int system_primary_500 = 17170467; // 0x1060023

    field public static final int system_primary_600 = 17170468; // 0x1060024

    field public static final int system_primary_700 = 17170469; // 0x1060025

    field public static final int system_primary_800 = 17170470; // 0x1060026

    field public static final int system_primary_900 = 17170471; // 0x1060027

    field public static final int system_secondary_0 = 17170473; // 0x1060029

    field public static final int system_secondary_100 = 17170475; // 0x106002b

    field public static final int system_secondary_1000 = 17170484; // 0x1060034

    field public static final int system_secondary_200 = 17170476; // 0x106002c

    field public static final int system_secondary_300 = 17170477; // 0x106002d

    field public static final int system_secondary_400 = 17170478; // 0x106002e

    field public static final int system_secondary_50 = 17170474; // 0x106002a

    field public static final int system_secondary_500 = 17170479; // 0x106002f

    field public static final int system_secondary_600 = 17170480; // 0x1060030

    field public static final int system_secondary_700 = 17170481; // 0x1060031

    field public static final int system_secondary_800 = 17170482; // 0x1060032

    field public static final int system_secondary_900 = 17170483; // 0x1060033

    field public static final int system_accent1_0 = 17170485; // 0x1060035

    field public static final int system_accent1_100 = 17170487; // 0x1060037

    field public static final int system_accent1_1000 = 17170496; // 0x1060040

    field public static final int system_accent1_200 = 17170488; // 0x1060038

    field public static final int system_accent1_300 = 17170489; // 0x1060039

    field public static final int system_accent1_400 = 17170490; // 0x106003a

    field public static final int system_accent1_50 = 17170486; // 0x1060036

    field public static final int system_accent1_500 = 17170491; // 0x106003b

    field public static final int system_accent1_600 = 17170492; // 0x106003c

    field public static final int system_accent1_700 = 17170493; // 0x106003d

    field public static final int system_accent1_800 = 17170494; // 0x106003e

    field public static final int system_accent1_900 = 17170495; // 0x106003f

    field public static final int system_accent2_0 = 17170497; // 0x1060041

    field public static final int system_accent2_100 = 17170499; // 0x1060043

    field public static final int system_accent2_1000 = 17170508; // 0x106004c

    field public static final int system_accent2_200 = 17170500; // 0x1060044

    field public static final int system_accent2_300 = 17170501; // 0x1060045

    field public static final int system_accent2_400 = 17170502; // 0x1060046

    field public static final int system_accent2_50 = 17170498; // 0x1060042

    field public static final int system_accent2_500 = 17170503; // 0x1060047

    field public static final int system_accent2_600 = 17170504; // 0x1060048

    field public static final int system_accent2_700 = 17170505; // 0x1060049

    field public static final int system_accent2_800 = 17170506; // 0x106004a

    field public static final int system_accent2_900 = 17170507; // 0x106004b

    field public static final int system_accent3_0 = 17170509; // 0x106004d

    field public static final int system_accent3_100 = 17170511; // 0x106004f

    field public static final int system_accent3_1000 = 17170520; // 0x1060058

    field public static final int system_accent3_200 = 17170512; // 0x1060050

    field public static final int system_accent3_300 = 17170513; // 0x1060051

    field public static final int system_accent3_400 = 17170514; // 0x1060052

    field public static final int system_accent3_50 = 17170510; // 0x106004e

    field public static final int system_accent3_500 = 17170515; // 0x1060053

    field public static final int system_accent3_600 = 17170516; // 0x1060054

    field public static final int system_accent3_700 = 17170517; // 0x1060055

    field public static final int system_accent3_800 = 17170518; // 0x1060056

    field public static final int system_accent3_900 = 17170519; // 0x1060057

    field public static final int system_neutral1_0 = 17170461; // 0x106001d

    field public static final int system_neutral1_100 = 17170463; // 0x106001f

    field public static final int system_neutral1_1000 = 17170472; // 0x1060028

    field public static final int system_neutral1_200 = 17170464; // 0x1060020

    field public static final int system_neutral1_300 = 17170465; // 0x1060021

    field public static final int system_neutral1_400 = 17170466; // 0x1060022

    field public static final int system_neutral1_50 = 17170462; // 0x106001e

    field public static final int system_neutral1_500 = 17170467; // 0x1060023

    field public static final int system_neutral1_600 = 17170468; // 0x1060024

    field public static final int system_neutral1_700 = 17170469; // 0x1060025

    field public static final int system_neutral1_800 = 17170470; // 0x1060026

    field public static final int system_neutral1_900 = 17170471; // 0x1060027

    field public static final int system_neutral2_0 = 17170473; // 0x1060029

    field public static final int system_neutral2_100 = 17170475; // 0x106002b

    field public static final int system_neutral2_1000 = 17170484; // 0x1060034

    field public static final int system_neutral2_200 = 17170476; // 0x106002c

    field public static final int system_neutral2_300 = 17170477; // 0x106002d

    field public static final int system_neutral2_400 = 17170478; // 0x106002e

    field public static final int system_neutral2_50 = 17170474; // 0x106002a

    field public static final int system_neutral2_500 = 17170479; // 0x106002f

    field public static final int system_neutral2_600 = 17170480; // 0x1060030

    field public static final int system_neutral2_700 = 17170481; // 0x1060031

    field public static final int system_neutral2_800 = 17170482; // 0x1060032

    field public static final int system_neutral2_900 = 17170483; // 0x1060033

    field public static final int tab_indicator_text = 17170441; // 0x1060009

    field @Deprecated public static final int tertiary_text_dark = 17170448; // 0x1060010

    field @Deprecated public static final int tertiary_text_light = 17170449; // 0x1060011

core/java/android/appwidget/AppWidgetHostView.java

+2 −2
Original line number Diff line number Diff line
@@ -841,8 +841,8 @@ public class AppWidgetHostView extends FrameLayout { 
     * Calling this method will trigger a full re-inflation of the App Widget.

     *

     * The color resources that can be overloaded are the ones whose name is prefixed with

     * {@code system_primary_}, {@code system_secondary_} or {@code system_neutral_}, for example

     * {@link android.R.color#system_primary_500}.

     * {@code system_neutral} or {@code system_accent}, for example

     * {@link android.R.color#system_neutral1_500}.

     */

    public void setColorResources(@NonNull SparseIntArray colorMapping) {

        mColorResources = RemoteViews.ColorResources.create(mContext, colorMapping);

core/java/android/widget/RemoteViews.java

+4 −4
Original line number Diff line number Diff line
@@ -5476,14 +5476,14 @@ public class RemoteViews implements Parcelable, Filter { 
    /**

     * Object allowing the modification of a context to overload the system's dynamic colors.

     *

     * Only colors from {@link android.R.color#system_primary_0} to

     * {@link android.R.color#system_neutral_1000} can be overloaded.

     * Only colors from {@link android.R.color#system_accent1_0} to

     * {@link android.R.color#system_neutral2_1000} can be overloaded.

     * @hide

     */

    public static final class ColorResources {

        // Set of valid colors resources.

        private static final int FIRST_RESOURCE_COLOR_ID = android.R.color.system_primary_0;

        private static final int LAST_RESOURCE_COLOR_ID = android.R.color.system_neutral_1000;

        private static final int FIRST_RESOURCE_COLOR_ID = android.R.color.system_neutral1_0;

        private static final int LAST_RESOURCE_COLOR_ID = android.R.color.system_accent3_1000;

        // Size, in bytes, of an entry in the array of colors in an ARSC file.

        private static final int ARSC_ENTRY_SIZE = 16;

core/res/remote_color_resources_res/values/colors.xml

+60 −36
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<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_primary_0">#01010101</color>

  <color name="system_primary_50">#02020202</color>

  <color name="system_primary_100">#03030303</color>

  <color name="system_primary_200">#04040404</color>

  <color name="system_primary_300">#05050505</color>

  <color name="system_primary_400">#06060606</color>

  <color name="system_primary_500">#07070707</color>

  <color name="system_primary_600">#08080808</color>

  <color name="system_primary_700">#09090909</color>

  <color name="system_primary_800">#0a0a0a0a</color>

  <color name="system_primary_900">#0b0b0b0b</color>

  <color name="system_primary_1000">#0c0c0c0c</color>

  <color name="system_secondary_0">#10101010</color>

  <color name="system_secondary_50">#20202020</color>

  <color name="system_secondary_100">#30303030</color>

  <color name="system_secondary_200">#40404040</color>

  <color name="system_secondary_300">#50505050</color>

  <color name="system_secondary_400">#60606060</color>

  <color name="system_secondary_500">#70707070</color>

  <color name="system_secondary_600">#80808080</color>

  <color name="system_secondary_700">#90909090</color>

  <color name="system_secondary_800">#a0a0a0a0</color>

  <color name="system_secondary_900">#b0b0b0b0</color>

  <color name="system_secondary_1000">#c0c0c0c0</color>

  <color name="system_neutral_0">#1f1f1f1f</color>

  <color name="system_neutral_50">#2f2f2f2f</color>

  <color name="system_neutral_100">#3f3f3f3f</color>

  <color name="system_neutral_200">#4f4f4f4f</color>

  <color name="system_neutral_300">#5f5f5f5f</color>

  <color name="system_neutral_400">#6f6f6f6f</color>

  <color name="system_neutral_500">#7f7f7f7f</color>

  <color name="system_neutral_600">#8f8f8f8f</color>

  <color name="system_neutral_700">#9f9f9f9f</color>

  <color name="system_neutral_800">#afafafaf</color>

  <color name="system_neutral_900">#bfbfbfbf</color>

  <color name="system_neutral_1000">#cfcfcfcf</color>

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

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

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

  <color name="system_accent1_200">#65d9c9</color>

  <color name="system_accent1_300">#45bdae</color>

  <color name="system_accent1_400">#1fa293</color>

  <color name="system_accent1_500">#008377</color>

  <color name="system_accent1_600">#006d61</color>

  <color name="system_accent1_700">#005449</color>

  <color name="system_accent1_800">#003c33</color>

  <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_50">#91fff4</color>

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

  <color name="system_accent2_200">#65d9c9</color>

  <color name="system_accent2_300">#45bdae</color>

  <color name="system_accent2_400">#1fa293</color>

  <color name="system_accent2_500">#008377</color>

  <color name="system_accent2_600">#006d61</color>

  <color name="system_accent2_700">#005449</color>

  <color name="system_accent2_800">#003c33</color>

  <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_50">#91fff4</color>

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

  <color name="system_accent3_200">#65d9c9</color>

  <color name="system_accent3_300">#45bdae</color>

  <color name="system_accent3_400">#1fa293</color>

  <color name="system_accent3_500">#008377</color>

  <color name="system_accent3_600">#006d61</color>

  <color name="system_accent3_700">#005449</color>

  <color name="system_accent3_800">#003c33</color>

  <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_50">#f0f0f0</color>

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

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

  <color name="system_neutral1_300">#ababab</color>

  <color name="system_neutral1_400">#909090</color>

  <color name="system_neutral1_500">#757575</color>

  <color name="system_neutral1_600">#5e5e5e</color>

  <color name="system_neutral1_700">#464646</color>

  <color name="system_neutral1_800">#303030</color>

  <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_50">#f0f0f0</color>

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

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

  <color name="system_neutral2_300">#ababab</color>

  <color name="system_neutral2_400">#909090</color>

  <color name="system_neutral2_500">#757575</color>

  <color name="system_neutral2_600">#5e5e5e</color>

  <color name="system_neutral2_700">#464646</color>

  <color name="system_neutral2_800">#303030</color>

  <color name="system_neutral2_900">#1b1b1b</color>

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

</resources>

core/res/remote_color_resources_res/values/public.xml

+60 −36
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

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

    <public name="system_primary_0" />

    <public name="system_primary_50" />

    <public name="system_primary_100" />

    <public name="system_primary_200" />

    <public name="system_primary_300" />

    <public name="system_primary_400" />

    <public name="system_primary_500" />

    <public name="system_primary_600" />

    <public name="system_primary_700" />

    <public name="system_primary_800" />

    <public name="system_primary_900" />

    <public name="system_primary_1000" />

    <public name="system_secondary_0" />

    <public name="system_secondary_50" />

    <public name="system_secondary_100" />

    <public name="system_secondary_200" />

    <public name="system_secondary_300" />

    <public name="system_secondary_400" />

    <public name="system_secondary_500" />

    <public name="system_secondary_600" />

    <public name="system_secondary_700" />

    <public name="system_secondary_800" />

    <public name="system_secondary_900" />

    <public name="system_secondary_1000" />

    <public name="system_neutral_0" />

    <public name="system_neutral_50" />

    <public name="system_neutral_100" />

    <public name="system_neutral_200" />

    <public name="system_neutral_300" />

    <public name="system_neutral_400" />

    <public name="system_neutral_500" />

    <public name="system_neutral_600" />

    <public name="system_neutral_700" />

    <public name="system_neutral_800" />

    <public name="system_neutral_900" />

    <public name="system_neutral_1000" />

    <public name="system_accent1_0" />

    <public name="system_accent1_50" />

    <public name="system_accent1_100" />

    <public name="system_accent1_200" />

    <public name="system_accent1_300" />

    <public name="system_accent1_400" />

    <public name="system_accent1_500" />

    <public name="system_accent1_600" />

    <public name="system_accent1_700" />

    <public name="system_accent1_800" />

    <public name="system_accent1_900" />

    <public name="system_accent1_1000" />

    <public name="system_accent2_0" />

    <public name="system_accent2_50" />

    <public name="system_accent2_100" />

    <public name="system_accent2_200" />

    <public name="system_accent2_300" />

    <public name="system_accent2_400" />

    <public name="system_accent2_500" />

    <public name="system_accent2_600" />

    <public name="system_accent2_700" />

    <public name="system_accent2_800" />

    <public name="system_accent2_900" />

    <public name="system_accent2_1000" />

    <public name="system_accent3_0" />

    <public name="system_accent3_50" />

    <public name="system_accent3_100" />

    <public name="system_accent3_200" />

    <public name="system_accent3_300" />

    <public name="system_accent3_400" />

    <public name="system_accent3_500" />

    <public name="system_accent3_600" />

    <public name="system_accent3_700" />

    <public name="system_accent3_800" />

    <public name="system_accent3_900" />

    <public name="system_accent3_1000" />

    <public name="system_neutral1_0" />

    <public name="system_neutral1_50" />

    <public name="system_neutral1_100" />

    <public name="system_neutral1_200" />

    <public name="system_neutral1_300" />

    <public name="system_neutral1_400" />

    <public name="system_neutral1_500" />

    <public name="system_neutral1_600" />

    <public name="system_neutral1_700" />

    <public name="system_neutral1_800" />

    <public name="system_neutral1_900" />

    <public name="system_neutral1_1000" />

    <public name="system_neutral2_0" />

    <public name="system_neutral2_50" />

    <public name="system_neutral2_100" />

    <public name="system_neutral2_200" />

    <public name="system_neutral2_300" />

    <public name="system_neutral2_400" />

    <public name="system_neutral2_500" />

    <public name="system_neutral2_600" />

    <public name="system_neutral2_700" />

    <public name="system_neutral2_800" />

    <public name="system_neutral2_900" />

    <public name="system_neutral2_1000" />

  </public-group>

</resources>