Merge "CM11 Themes: Include alarms in mixnmatch." into cm-11.0 (0dbf8c22) · Commits · e / os / android_frameworks_base

core/java/android/provider/ThemesContract.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -228,6 +228,7 @@ public class ThemesContract {
		public static final String KEY_STATUS_BAR = "mixnmatch_status_bar";
		public static final String KEY_BOOT_ANIM = "mixnmatch_boot_anim";
		public static final String KEY_FONT = "mixnmatch_font";
		public static final String KEY_ALARM = "mixnmatch_alarm";
		public static final String KEY_NOTIFICATIONS = "mixnmatch_notifications";
		public static final String KEY_RINGTONE = "mixnmatch_ringtone";
		public static final String KEY_OVERLAYS = "mixnmatch_overlays";
		@@ -240,6 +241,7 @@ public class ThemesContract {
		KEY_FONT,
		KEY_NOTIFICATIONS,
		KEY_RINGTONE,
		KEY_ALARM,
		KEY_OVERLAYS
		};

		@@ -287,8 +289,12 @@ public class ThemesContract {
		return MixnMatchColumns.KEY_FONT;
		} else if (component.equals(ThemesColumns.MODIFIES_BOOT_ANIM)) {
		return MixnMatchColumns.KEY_BOOT_ANIM;
		} else if (component.equals(ThemesColumns.MODIFIES_ALARMS)) {
		return MixnMatchColumns.KEY_ALARM;
		} else if (component.equals(ThemesColumns.MODIFIES_NOTIFICATIONS)) {
		return MixnMatchColumns.KEY_NOTIFICATIONS;
		} else if (component.equals(ThemesColumns.MODIFIES_RINGTONES)) {
		return MixnMatchColumns.KEY_RINGTONE;
		} else if (component.equals(ThemesColumns.MODIFIES_OVERLAYS)) {
		return MixnMatchColumns.KEY_OVERLAYS;
		}
		@@ -310,8 +316,12 @@ public class ThemesContract {
		return ThemesColumns.MODIFIES_FONTS;
		} else if (mixnmatchKey.equals(MixnMatchColumns.KEY_BOOT_ANIM)) {
		return ThemesColumns.MODIFIES_BOOT_ANIM;
		} else if (mixnmatchKey.equals(MixnMatchColumns.KEY_ALARM)) {
		return ThemesColumns.MODIFIES_ALARMS;
		} else if (mixnmatchKey.equals(MixnMatchColumns.KEY_NOTIFICATIONS)) {
		return ThemesColumns.MODIFIES_NOTIFICATIONS;
		} else if (mixnmatchKey.equals(MixnMatchColumns.KEY_RINGTONE)) {
		return ThemesColumns.MODIFIES_RINGTONES;
		} else if (mixnmatchKey.equals(MixnMatchColumns.KEY_OVERLAYS)) {
		return ThemesColumns.MODIFIES_OVERLAYS;
		}