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

Commit 1485991e authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Change MNC codename to just M." into mnc-dev

parents 725834d6 bf0fd732

src/com/android/deskclock/NumberPickerCompat.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

        }

src/com/android/deskclock/Utils.java

+2 −2
Original line number 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() {

        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) {