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

Commit a83e408a authored Mar 20, 2020 by Daniel Bright Committed by Automerger Merge Worker Mar 20, 2020

Merge "Remove simColors from public.xml and rename" into rvc-dev am: 9c11d2ec am: 4051255a

Change-Id: Ic658192f41bf422dbca2711bb2c1d46a19633fe5

parents 0b35d911 4051255a

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -252,7 +252,6 @@ 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="simColors">
		<array name="sim_colors">
		<item>@color/Teal_700</item>
		<item>@color/Blue_700</item>
		<item>@color/Indigo_700</item>

core/res/res/values/public.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -3068,11 +3068,6 @@
		<public name="accessibilityActionImeEnter" />
		</public-group>

		<public-group type="array" first-id="0x01070006">
		<!-- @hide @SystemApi -->
		<public name="simColors" />
		</public-group>

		<public-group type="string" first-id="0x0104002c">
		<!-- @hide -->
		<public name="config_customMediaKeyDispatcher" />

core/res/res/values/symbols.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -1222,7 +1222,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="simColors" />
		<java-symbol type="array" name="sim_colors" />
		<java-symbol type="array" name="special_locale_codes" />
		<java-symbol type="array" name="special_locale_names" />
		<java-symbol type="array" name="supported_locales" />