From 75089d7cb4053dc379c168b31bf0c0c7dad7ac69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joa=CC=83o=20Paulo=20Barraca?= <jpbarraca@gmail.com>
Date: Fri, 24 Mar 2017 18:10:05 +0000
Subject: [PATCH 1/4] Add HPlus and LiveView icons to level list

---
 app/src/main/res/drawable/level_list_device.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/res/drawable/level_list_device.xml b/app/src/main/res/drawable/level_list_device.xml
index 7de9a84f2..0c5208894 100644
--- a/app/src/main/res/drawable/level_list_device.xml
+++ b/app/src/main/res/drawable/level_list_device.xml
@@ -5,10 +5,17 @@
     <item android:maxLevel="110" android:drawable="@drawable/ic_device_miband_disabled" />
     <item android:maxLevel="111" android:drawable="@drawable/ic_device_miband_disabled" />
     <item android:maxLevel="120" android:drawable="@drawable/ic_device_lovetoy_disabled" />
+    <item android:maxLevel="130" android:drawable="@drawable/ic_device_default_disabled" />
+    <item android:maxLevel="140" android:drawable="@drawable/ic_device_hplus_disabled" />
+    <item android:maxLevel="141" android:drawable="@drawable/ic_device_hplus_disabled" />
 
     <item android:maxLevel="199" android:drawable="@drawable/ic_launcher" />
     <item android:maxLevel="201" android:drawable="@drawable/ic_device_pebble" />
     <item android:maxLevel="210" android:drawable="@drawable/ic_device_miband" />
     <item android:maxLevel="211" android:drawable="@drawable/ic_device_miband" />
     <item android:maxLevel="220" android:drawable="@drawable/ic_device_lovetoy" />
+    <item android:maxLevel="230" android:drawable="@drawable/ic_launcher" />
+    <item android:maxLevel="240" android:drawable="@drawable/ic_device_hplus" />
+    <item android:maxLevel="241" android:drawable="@drawable/ic_device_hplus" />
+
 </level-list>
\ No newline at end of file

From 11b48e7a1a7e14e245340e620679fe6ac4f19482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joa=CC=83o=20Paulo=20Barraca?= <jpbarraca@gmail.com>
Date: Fri, 24 Mar 2017 20:52:14 +0000
Subject: [PATCH 2/4] Set HPlus Sleep Intensity to 10%

---
 .../gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java
index 2946731e0..09f857ef2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java
@@ -193,6 +193,9 @@ public class HPlusHealthSampleProvider extends AbstractSampleProvider<HPlusHealt
             for (HPlusHealthActivitySample sample : samples) {
 
                 if (sample.getTimestamp() >= overlay.getTimestampFrom() && sample.getTimestamp() < overlay.getTimestampTo()) {
+                    if(overlay.getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP || overlay.getRawKind() == ActivityKind.TYPE_DEEP_SLEEP)
+                        sample.setRawIntensity(10);
+
                     sample.setRawKind(overlay.getRawKind());
                 }
             }

From d550defcb3bdb5529b5ce59280a31916ff5e5ed9 Mon Sep 17 00:00:00 2001
From: Daniele Gobbetti <daniele+github@gobbetti.name>
Date: Sun, 26 Mar 2017 17:57:03 +0200
Subject: [PATCH 3/4] Do not save an alarm as "smart" if the device does not
 support it (#612)

Opening the activity when a device that does not support smart alarms is connected hides the "smart alarm" toggle. This is now reflected also on the saved data.
This solution is not ideal in case of multiple devices but as long as #577 is not solved its the best we can do.
---
 CHANGELOG.md                                                   | 3 +++
 .../freeyourgadget/gadgetbridge/activities/AlarmDetails.java   | 2 +-
 app/src/main/res/xml/changelog_master.xml                      | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 767e9ac49..b3a95f41a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ###Changelog
 
+###Version next
+* Alarms activity improvements and fixes
+
 ###Version 0.18.3
 * Fix bug that caused the same value in weekly charts for every day on Android 6 and older
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
index 43744716a..d14db9dc6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
@@ -105,7 +105,7 @@ public class AlarmDetails extends GBActivity {
     }
 
     private void updateAlarm() {
-        alarm.setSmartWakeup(cbSmartWakeup.isChecked());
+        alarm.setSmartWakeup(supportsSmartWakeup() && cbSmartWakeup.isChecked());
         alarm.setRepetition(cbMonday.isChecked(), cbTuesday.isChecked(), cbWednesday.isChecked(), cbThursday.isChecked(), cbFriday.isChecked(), cbSaturday.isChecked(), cbSunday.isChecked());
         alarm.setHour(timePicker.getCurrentHour());
         alarm.setMinute(timePicker.getCurrentMinute());
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index e881747ab..22c00ad66 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="next">
+        <change>Alarms activity improvements and fixes</change>
+    </release>
     <release version="0.18.3" versioncode="90">
         <change>Fix bug that caused the same value in weekly charts for every day on Android 6 and older</change>
     </release>

From 1813ec9378b70bb66f0a9b014bb17b03859b9a31 Mon Sep 17 00:00:00 2001
From: Daniele Gobbetti <daniele+github@gobbetti.name>
Date: Sun, 26 Mar 2017 20:29:57 +0200
Subject: [PATCH 4/4] Forbid landscape orientation on AlarmDetails activity.

Landscape mode triggers a bug in android DatePicker on devices with small screens.
Fixes #612
---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index df30fac78..b15323fc7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -337,6 +337,7 @@
         <activity
             android:name=".activities.AlarmDetails"
             android:label="@string/title_activity_alarm_details"
+            android:screenOrientation="portrait"
             android:parentActivityName=".activities.ConfigureAlarms" />
         <activity
             android:name=".activities.VibrationActivity"