diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-01 16:55:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 16:55:39 +0000 |
| commit | 759d2837a9352d82a0201e66bfc6cc4c573aa2cb (patch) | |
| tree | e4a008e7d1b02d9ebafe77ec42ff1066408c5241 | |
| parent | c0428b0db911860f792d855f750219a9493a24de (diff) | |
| parent | dcc05221e295af39711ddd9861826a04204ee541 (diff) | |
| download | android_packages_apps_DeskClock-759d2837a9352d82a0201e66bfc6cc4c573aa2cb.tar.gz android_packages_apps_DeskClock-759d2837a9352d82a0201e66bfc6cc4c573aa2cb.tar.bz2 android_packages_apps_DeskClock-759d2837a9352d82a0201e66bfc6cc4c573aa2cb.zip | |
am dcc05221: am 600f96bb: am 1485991e: Merge "Change MNC codename to just M." into mnc-dev
* commit 'dcc05221e295af39711ddd9861826a04204ee541':
Change MNC codename to just M.
| -rw-r--r-- | src/com/android/deskclock/NumberPickerCompat.java | 4 | ||||
| -rw-r--r-- | src/com/android/deskclock/Utils.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/deskclock/NumberPickerCompat.java b/src/com/android/deskclock/NumberPickerCompat.java index 43018d62f..477fb893e 100644 --- a/src/com/android/deskclock/NumberPickerCompat.java +++ b/src/com/android/deskclock/NumberPickerCompat.java @@ -36,9 +36,9 @@ public class NumberPickerCompat extends NumberPicker { @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void tintSelectionDivider(Context context) { 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. - // The divider is correctly tinted to controlColorNormal in MNC. + // The divider is correctly tinted to controlColorNormal in M. return; } diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java index 046984ad5..046df5444 100644 --- a/src/com/android/deskclock/Utils.java +++ b/src/com/android/deskclock/Utils.java @@ -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() { - 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) { |