Fix alarm clock icon appearing in status bar, increase fidelity of default gong sound

This commit is contained in:
Trevor Slocum 2016-10-13 20:35:15 -07:00
parent 6192f15aaa
commit 5b73d71e86
10 changed files with 25 additions and 15 deletions

View File

@ -1,3 +1,7 @@
1.4.0:
- Fix alarm icon appearing in the status bar when Daily Reminder is enabled
- Increase fidelity of the default gong sound
1.3.9:
- Fix inexact session duration due to battery saving measures introduced in Android 6.0

View File

@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.android.tools.build:gradle:2.2.1'
}
}
@ -24,8 +24,8 @@ android {
minSdkVersion 14
targetSdkVersion 24
versionCode 139
versionName "1.3.9"
versionCode 140
versionName "1.4.0"
}
lintOptions {

View File

@ -9,6 +9,7 @@ import android.media.MediaPlayer;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.SystemClock;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
@ -202,10 +203,10 @@ public class CompleteActivity extends Activity {
@Override
public void onPrepared(
MediaPlayer mp) {
SystemClock.sleep(MeditationAssistant.MEDIA_DELAY);
mp.start();
}
});
//mMediaPlayer.prepareAsync();
} else {
getMeditationAssistant().restoreVolume();
handler.postDelayed(clearWakeLock, 5000);

View File

@ -122,14 +122,17 @@ public class DailyNotification extends BroadcastReceiver {
);
if (Build.VERSION.SDK_INT >= 23) {
getMeditationAssistant().reminderAlarmManager.setAlarmClock(new AlarmManager.AlarmClockInfo(calendar.getTimeInMillis(), PendingIntent.getActivity(context, 0, new Intent(context, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT)), getMeditationAssistant().reminderPendingIntent);
/* Don't use setAlarmClock here as it will always place an alarm icon in the status bar */
getMeditationAssistant().reminderAlarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP,
calendar.getTimeInMillis(),
getMeditationAssistant().reminderPendingIntent);
} else if (Build.VERSION.SDK_INT >= 19) {
getMeditationAssistant().reminderAlarmManager.setExact(AlarmManager.RTC_WAKEUP,
calendar.getTimeInMillis(),
getMeditationAssistant().reminderPendingIntent);
} else {
getMeditationAssistant().reminderAlarmManager.setRepeating(AlarmManager.RTC_WAKEUP,
calendar.getTimeInMillis(), 1000,
getMeditationAssistant().reminderAlarmManager.set(AlarmManager.RTC_WAKEUP,
calendar.getTimeInMillis(),
getMeditationAssistant().reminderPendingIntent);
}

View File

@ -9,6 +9,7 @@ import android.media.AudioManager;
import android.media.MediaPlayer;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.SystemClock;
import android.preference.ListPreference;
import android.util.AttributeSet;
import android.util.Log;
@ -213,7 +214,6 @@ public class ListPreferenceSound extends ListPreference {
afd.getDeclaredLength());
mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
mMediaPlayer.prepareAsync();
// mMediaPlayer.prepare();
} catch (IllegalArgumentException e) {
e.printStackTrace();
} catch (IllegalStateException e) {

View File

@ -19,6 +19,7 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.SystemClock;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.text.InputType;
@ -159,10 +160,10 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
@Override
public void onPrepared(
MediaPlayer mp) {
SystemClock.sleep(MeditationAssistant.MEDIA_DELAY);
mp.start();
}
});
//mMediaPlayer.prepareAsync();
}
}
@ -1496,12 +1497,12 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
@Override
public void onPrepared(
MediaPlayer mp) {
SystemClock.sleep(MeditationAssistant.MEDIA_DELAY);
mp.start();
}
});
WakeLocker.acquire(getApplicationContext(), false);
//mMediaPlayer.prepareAsync();
}
}
@ -2041,10 +2042,10 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
@Override
public void onPrepared(
MediaPlayer mp) {
SystemClock.sleep(MeditationAssistant.MEDIA_DELAY);
mp.start();
}
});
//mMediaPlayer.prepareAsync();
}
}
@ -2145,10 +2146,10 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
@Override
public void onPrepared(
MediaPlayer mp) {
SystemClock.sleep(MeditationAssistant.MEDIA_DELAY);
mp.start();
}
});
//mMediaPlayer.prepareAsync();
}
}

View File

@ -67,6 +67,7 @@ public class MeditationAssistant extends Application {
public static String ACTION_REMINDER = "sh.ftp.rocketninelabs.meditationassistant.DAILY_NOTIFICATION";
public static String ACTION_UPDATED = "sh.ftp.rocketninelabs.meditationassistant.DAILY_NOTIFICATION_UPDATED";
public static int REQUEST_FIT = 22;
public static int MEDIA_DELAY = 1000;
public Boolean debug_widgets = false; // Debug
public long lastpostedsessionstart = 0;
public boolean ispaused = false;
@ -135,8 +136,8 @@ public class MeditationAssistant extends Application {
} else if (BuildConfig.FLAVOR.equals("opensource")) {
marketName = "fdroid";
} else { // To be uncommented based upon target market
//marketName = "google";
marketName = "amazon";
marketName = "google";
//marketName = "amazon";
//marketName = "getjar";
//marketName = "slideme";
}

Binary file not shown.

View File

@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.android.tools.build:gradle:2.2.1'
}
}