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

Commit d7b71384 authored Jul 31, 2015 by Dianne Hackborn Committed by Android Git Automerger Jul 31, 2015

am 1485991e: Merge "Change MNC codename to just M." into mnc-dev

* commit '1485991e':
  Change MNC codename to just M.

parents ac172417 1485991e

src/com/android/deskclock/NumberPickerCompat.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -36,9 +36,9 @@ public class NumberPickerCompat extends NumberPicker {
	@TargetApi(Build.VERSION_CODES.LOLLIPOP)		@TargetApi(Build.VERSION_CODES.LOLLIPOP)
	private void tintSelectionDivider(Context context) {		private void tintSelectionDivider(Context context) {
	if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP
	\|\| Build.VERSION.SDK_INT > Build.VERSION_CODES.MNC) {		\|\| Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
	// Accent color in KK will stay system blue, so leave divider color matching.		// Accent color in KK will stay system blue, so leave divider color matching.
	// The divider is correctly tinted to controlColorNormal in MNC.		// The divider is correctly tinted to controlColorNormal in M.
	return;		return;
	}		}

src/com/android/deskclock/Utils.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -165,10 +165,10 @@ public class Utils {
	}		}

	/**		/**
	* @return {@code true} if the device is {@link Build.VERSION_CODES#MNC} or later		* @return {@code true} if the device is {@link Build.VERSION_CODES#M} or later
	*/		*/
	public static boolean isMOrLater() {		public static boolean isMOrLater() {
	return Build.VERSION.SDK_INT >= Build.VERSION_CODES.MNC;		return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
	}		}

	public static void prepareHelpMenuItem(Context context, MenuItem helpMenuItem) {		public static void prepareHelpMenuItem(Context context, MenuItem helpMenuItem) {