Merge branch 'eclair' of github.com:cyanogen/android_frameworks_base into eclair (605020f7) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+27 −23

Original line number	Diff line number	Diff line
		@@ -1358,24 +1358,28 @@ public final class Settings {
		/**
		* bcrook - Double Carrier
		* Toggles whether to display the PLMN field on the Lockscreen
		* @hide
		*/
		public static final String SHOW_PLMN_LS = "show_plmn_ls";

		/**
		* bcrook - Double Carrier
		* Toggles whether to display the SPN field on the Lockscreen
		* @hide
		*/
		public static final String SHOW_SPN_LS = "show_spn_ls";

		/**
		* bcrook - Double Carrier
		* Toggles whether to display the PLMN field on the Notification bar
		* @hide
		*/
		public static final String SHOW_PLMN_SB = "show_plmn_sb";

		/**
		* bcrook - Double Carrier
		* Toggles whether to display the SPN field on the Notification bar
		* @hide
		*/
		public static final String SHOW_SPN_SB = "show_spn_sb";

+1 −1

Original line number	Diff line number	Diff line
		@@ -202,7 +202,7 @@ public class Color {
		* 'yellow', 'lightgray', 'darkgray'
		*/
		public static int parseColor(String colorString) {
		if (colorString.charAt(0) == '#') {
		if (colorString.startsWith("#")) {
		// Use a long to avoid rollovers on #ffXXXXXX
		long color = Long.parseLong(colorString.substring(1), 16);
		if (colorString.length() == 7) {