From 0ffa2ce45a7f79ad75638be863b7195c9472918b Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 29 Sep 2017 12:33:08 +0200
Subject: [PATCH] move up measuerement system from hplus to global preferences

---
 .../gadgetbridge/activities/SettingsActivity.java |  1 +
 .../devices/hplus/HPlusConstants.java             |  2 +-
 app/src/main/res/xml/preferences.xml              | 15 +++++++--------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
index 16cfe61e..5ce6de68 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
@@ -271,6 +271,7 @@ public class SettingsActivity extends AbstractSettingsActivity {
     @Override
     protected String[] getPreferenceKeysWithSummary() {
         return new String[]{
+                "measurement_system",
                 "pebble_emu_addr",
                 "pebble_emu_port",
                 "pebble_reconnect_attempts",
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java
index c52e016c..9f53c5d9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java
@@ -127,7 +127,7 @@ public final class HPlusConstants {
 
     public static final String PREF_HPLUS_SCREENTIME = "hplus_screentime";
     public static final String PREF_HPLUS_ALLDAYHR = "hplus_alldayhr";
-    public static final String PREF_HPLUS_UNIT = "hplus_unit";
+    public static final String PREF_HPLUS_UNIT = "measurement_system";
     public static final String PREF_HPLUS_TIMEFORMAT = "hplus_timeformat";
     public static final String PREF_HPLUS_WRIST = "hplus_wrist";
     public static final String PREF_HPLUS_SIT_START_TIME = "hplus_sit_start_time";
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index e4cc5581..56b47420 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -34,6 +34,13 @@
             android:entryValues="@array/pref_language_values"
             android:defaultValue="default"
             android:summary="%s" />
+        <ListPreference
+            android:defaultValue="metric"
+            android:entries="@array/pref_entries_unit_system"
+            android:entryValues="@array/pref_values_unit_system"
+            android:key="measurement_system"
+            android:summary="%s"
+            android:title="@string/pref_title_unit_system" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="minimize_priority"
@@ -458,14 +465,6 @@
                     android:key="hplus_alldayhr"
                     android:title="@string/prefs_title_all_day_heart_rate" />
 
-                <ListPreference
-                    android:defaultValue="metric"
-                    android:entries="@array/pref_entries_unit_system"
-                    android:entryValues="@array/pref_values_unit_system"
-                    android:key="hplus_unit"
-                    android:title="@string/pref_title_unit_system"
-                    android:summary="%s" />
-
             </PreferenceCategory>
 
         </PreferenceScreen>