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

Commit 16981d2c authored by James Lemieux's avatar James Lemieux
Browse files

Refer to Build.VERSION.MNC to check for M platform

Change-Id: Ifdd61667c6046d3c007ba7ffd62bdf70eb373a43
parent de765346
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.text.format.DateFormat;
@@ -159,10 +158,10 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
     */
    private boolean isNextAlarmChangedAction(String action) {
        final String nextAlarmIntentAction;
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
            nextAlarmIntentAction = AlarmStateManager.SYSTEM_ALARM_CHANGE_ACTION;
        } else {
        if (Utils.isLOrLater()) {
            nextAlarmIntentAction = AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED;
        } else {
            nextAlarmIntentAction = AlarmStateManager.SYSTEM_ALARM_CHANGE_ACTION;
        }
        return nextAlarmIntentAction.equals(action);
    }
+1 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Vibrator;
import android.preference.PreferenceManager;
@@ -109,8 +108,7 @@ public abstract class AlarmClockFragment extends DeskClockFragment implements
    private static final String PREF_KEY_DEFAULT_ALARM_RINGTONE_URI = "default_alarm_ringtone_uri";

    // Use transitions only in API 21+
    private static final boolean USE_TRANSITION_FRAMEWORK =
            Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
    private static final boolean USE_TRANSITION_FRAMEWORK = Utils.isLOrLater();

    // This extra is used when receiving an intent to create an alarm, but no alarm details
    // have been passed in, so the alarm page should start the process of creating a new alarm.
+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.animation.ObjectAnimator;
import android.animation.PropertyValuesHolder;
import android.animation.ValueAnimator;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.util.Property;
import android.view.View;
@@ -94,7 +93,7 @@ public class AnimatorUtils {
    private static boolean sTryAnimateValue = true;

    public static void setAnimatedFraction(ValueAnimator animator, float fraction) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
        if (Utils.isLMR1OrLater()) {
            animator.setCurrentFraction(fraction);
            return;
        }
+3 −5
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ import android.media.MediaPlayer;
import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerThread;
@@ -151,8 +150,7 @@ public class AsyncRingtonePlayer {
     */
    private PlaybackDelegate getPlaybackDelegate() {
        if (mPlaybackDelegate == null) {
            // TODO change this to Build.VERSION.SDK_INT > Build.VERSION.LOLLIPOP_MR1
            if (Build.VERSION.CODENAME.equals("MNC")) {
            if (Utils.isMOrLater()) {
                // Use the newer Ringtone-based playback delegate because it does not require
                // any permissions to read from the SD card. (M+)
                mPlaybackDelegate = new RingtonePlaybackDelegate();
@@ -255,7 +253,7 @@ public class AsyncRingtonePlayer {
        private void startAlarm(MediaPlayer player) throws IOException {
            // do not play alarms if stream volume is 0 (typically because ringer mode is silent).
            if (mAudioManager.getStreamVolume(AudioManager.STREAM_ALARM) != 0) {
                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                if (Utils.isLOrLater()) {
                    player.setAudioAttributes(new AudioAttributes.Builder()
                            .setUsage(AudioAttributes.USAGE_ALARM)
                            .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
@@ -369,7 +367,7 @@ public class AsyncRingtonePlayer {
                return;
            }

            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
            if (Utils.isLOrLater()) {
                mRingtone.setAudioAttributes(new AudioAttributes.Builder()
                        .setUsage(AudioAttributes.USAGE_ALARM)
                        .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+3 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.media.AudioManager;
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.annotation.VisibleForTesting;
@@ -170,9 +169,9 @@ public class DeskClock extends BaseActivity
            alarmTab.setIcon(R.drawable.ic_tab_alarm);
            alarmTab.setContentDescription(R.string.menu_alarm);
            mTabsAdapter.addTab(alarmTab,
                    Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP
                            ? AlarmClockFragmentPreL.class
                            : AlarmClockFragmentPostL.class,
                    Utils.isLOrLater()
                            ? AlarmClockFragmentPostL.class
                            : AlarmClockFragmentPreL.class,
                    ALARM_TAB_INDEX);

            final Tab clockTab = mActionBar.newTab();
Loading