diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
index bd538eb..854f60d 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -709,7 +709,7 @@ public class MainActivity extends AppCompatActivity {
acceptAlarmButton.setEnabled(true);
} else {
acceptAlarmButton.setText(R.string.AcceptAlarm);
- acceptAlarmButton.setBackgroundColor(Color.DKGRAY);
+ //acceptAlarmButton.setBackgroundColor(Color.DKGRAY);
if (mConnection.mBound)
if ((mConnection.mSdServer.isLatchAlarms())
|| mConnection.mSdServer.mSdData.mFallActive) {
@@ -730,15 +730,17 @@ public class MainActivity extends AppCompatActivity {
if (mConnection.mBound)
if (mConnection.mSdServer.isAudibleCancelled()) {
cancelAudibleButton.setText(getString(R.string.AudibleAlarmsCancelledFor)
- + mConnection.mSdServer.
+ + " " +mConnection.mSdServer.
cancelAudibleTimeRemaining()
- + " sec."
- + getString(R.string.PressToReEnable));
+ + " sec");
+ cancelAudibleButton.setEnabled(true);
} else {
if (mConnection.mSdServer.mAudibleAlarm) {
cancelAudibleButton.setText(R.string.CancelAudibleAlarms);
+ cancelAudibleButton.setEnabled(true);
} else {
cancelAudibleButton.setText(R.string.AudibleAlarmsOff);
+ cancelAudibleButton.setEnabled(false);
}
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2e0734c..25476a8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,9 +66,9 @@
SMS Will Be Sent in
CANCEL?
Accept Alarm
- Audible Alarms Cancelled for
- Press to re-enable
- Cancel Audible Alarms (temporarily)
+ Muted for
+ Restore
+ Mute Alarms
Audible Alarms OFF
FAULT
Authenticate