Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

Merge branch 'settings_layout_fix' of https://github.com/lukeswitz/haven into lukeswitz-settings_layout_fix

n8fr813a67c32f095
diff --cc src/main/res/xml/settings.xml
index d8ae0d5,03c9795..124e81f
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@@ -52,17 -66,20 +66,20 @@@
android:key="config_movement"
android:title="@string/accelerometer_prompt" />
-
</PreferenceCategory>
- <PreferenceCategory android:title="@string/label_notifications">
+
+ <PreferenceCategory
+ app:iconSpaceReserved="false"
+ android:title="@string/label_notifications">
<SwitchPreference
+ app:iconSpaceReserved="false"
- android:defaultValue="true"
- android:key="sms_active"
- android:title="@string/sms_label" />
+ android:defaultValue="false"
+ android:key="remote_notification_active"
+ android:title="@string/remote_notification_label" />
<EditTextPreference
- style="@style/AppPreference.DialogPreferenceSave"
+ app:iconSpaceReserved="false"
android:dialogLayout="@layout/pref_dialog_edit_text_hint"
android:dialogMessage="@string/sms_dialog_message"
android:inputType="phone"
@@@ -115,18 -134,13 +134,22 @@@
android:summary="@string/hearbeat_monitor_dialog"
android:title="@string/hearbeat_monitor_summary"/>
+ <EditTextPreference
++ app:iconSpaceReserved="false"
+ android:dialogLayout="@layout/pref_dialog_edit_text"
+ android:dialogMessage="@string/hearbeat_message_dialog"
+ android:inputType="text"
+ android:key="heartbeat_monitor_message"
+ android:title="@string/hearbeat_message_title"
+ android:summary="@string/hearbeat_message_summary" />
+
</PreferenceCategory>
- <PreferenceCategory android:title="@string/remote_access">
+ <PreferenceCategory
+ app:iconSpaceReserved="false"
+ android:title="@string/remote_access">
<SwitchPreference
+ app:iconSpaceReserved="false"
android:defaultValue="false"
android:key="remote_access_active"
android:summary="@string/remote_access_label"