diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java index 86c63652a7..5a168db92d 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/AlertPlayer.java @@ -554,6 +554,9 @@ protected void VibrateNotifyMakeNoise(Context context, AlertType alert, String b } volumeFrac = Math.max(volumeFrac, 0); // Limit volumeFrac to values greater than and equal to 0 volumeFrac = Math.min(volumeFrac, 1); // Limit volumeFrac to values less than and equal to 1 + if (Pref.getBooleanDefaultFalse("ascending_volume_to_medium") && profile == ALERT_PROFILE_ASCENDING) { // If ascending volume profile is chosen and ascending_volume_to_medium is enabled + volumeFrac = Math.min(volumeFrac, (float) 0.7); // Clamp the ascending volume at the medium level. + } if (profile == ALERT_PROFILE_MEDIUM) { volumeFrac = (float) 0.7; } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1d28876c04..b5b4139d17 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1492,7 +1492,10 @@ Whether notifications should be grouped together. Incompatible with \'Number Item in Notification Area\' option Group notifications together For ascending volume profile, delay the start of the alert sound by 3 minutes. The vibration (if enabled) starts as soon as the alert triggers regardless of this setting. + Ascending Volume settings Delay Ascending Volume + When enabled, ascending volume profile will ascend to medium volume instead of maximum + Ascend to medium Play sound when Initial Calibration is requested Initial Alert Noisy Readings diff --git a/app/src/main/res/xml/pref_notifications.xml b/app/src/main/res/xml/pref_notifications.xml index 6e33772e73..587c470d52 100644 --- a/app/src/main/res/xml/pref_notifications.xml +++ b/app/src/main/res/xml/pref_notifications.xml @@ -93,44 +93,59 @@ android:summary="@string/create_shortcut" android:title="@string/shortcut_to_bg_alerts" /> - - - - - - + + + + - + + + + + - + + + +