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

Commit ffb38181 authored Jan 31, 2020 by Automerger Merge Worker

Merge changes from topic "CherryPickMainline" am: cd70c935 am: 02408099

Change-Id: I4c2d7b8573805119915572c33486e5fd2cdf915e

parents f34d0956 02408099

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -226,6 +226,7 @@ package android {

		public static final class R.array {
		field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005
		field public static final int simColors = 17235974; // 0x1070006
		}

		public static final class R.attr {

core/res/res/values/arrays.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -165,7 +165,7 @@
		<item>中文 (繁體)</item>
		</string-array>

		<array name="sim_colors">
		<array name="simColors">
		<item>@color/Teal_700</item>
		<item>@color/Blue_700</item>
		<item>@color/Indigo_700</item>

core/res/res/values/public.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -3021,6 +3021,10 @@
		<public-group type="color" first-id="0x0106001d">
		</public-group>

		<public-group type="array" first-id="0x01070006">
		<!-- @hide @SystemApi -->
		<public name="simColors" />
		</public-group>
		<!-- ===============================================================
		DO NOT ADD UN-GROUPED ITEMS HERE

core/res/res/values/symbols.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -1302,7 +1302,7 @@
		<java-symbol type="array" name="preloaded_color_state_lists" />
		<java-symbol type="array" name="preloaded_drawables" />
		<java-symbol type="array" name="preloaded_freeform_multi_window_drawables" />
		<java-symbol type="array" name="sim_colors" />
		<java-symbol type="array" name="simColors" />
		<java-symbol type="array" name="special_locale_codes" />
		<java-symbol type="array" name="special_locale_names" />
		<java-symbol type="array" name="supported_locales" />