nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move up measuerement system from hplus to global preferences

This commit is contained in:
Andreas Shimokawa 2017-09-29 12:33:08 +02:00
parent 7137387b08
commit 0ffa2ce45a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
View File

@ -271,6 +271,7 @@ public class SettingsActivity extends AbstractSettingsActivity {
@Override @Override
protected String[] getPreferenceKeysWithSummary() { protected String[] getPreferenceKeysWithSummary() {
return new String[]{ return new String[]{
"measurement_system",
"pebble_emu_addr", "pebble_emu_addr",
"pebble_emu_port", "pebble_emu_port",
"pebble_reconnect_attempts", "pebble_reconnect_attempts",

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java
View File

@ -127,7 +127,7 @@ public final class HPlusConstants {
public static final String PREF_HPLUS_SCREENTIME = "hplus_screentime"; public static final String PREF_HPLUS_SCREENTIME = "hplus_screentime";
public static final String PREF_HPLUS_ALLDAYHR = "hplus_alldayhr"; 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_TIMEFORMAT = "hplus_timeformat";
public static final String PREF_HPLUS_WRIST = "hplus_wrist"; public static final String PREF_HPLUS_WRIST = "hplus_wrist";
public static final String PREF_HPLUS_SIT_START_TIME = "hplus_sit_start_time"; public static final String PREF_HPLUS_SIT_START_TIME = "hplus_sit_start_time";

15
app/src/main/res/xml/preferences.xml
View File

@ -34,6 +34,13 @@
android:entryValues="@array/pref_language_values" android:entryValues="@array/pref_language_values"
android:defaultValue="default" android:defaultValue="default"
android:summary="%s" /> 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 <CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:key="minimize_priority" android:key="minimize_priority"
@ -458,14 +465,6 @@
android:key="hplus_alldayhr" android:key="hplus_alldayhr"
android:title="@string/prefs_title_all_day_heart_rate" /> 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> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>