Merge branch 'settings-p2' of https://github.com/percy-g2/haven into …

…percy-g2-settings-p2
guardianproject · Jan 12, 2018 · e7fa68e · e7fa68e
2 parents 9e1ef72 + 6e658a8
commit e7fa68e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.java
@@ -61,15 +61,12 @@ public void onCreatePreferencesFix(Bundle bundle, String s) {
             switch (camera) {
                 case PreferenceManager.FRONT:
                     ((ListPreference) findPreference(PreferenceManager.CAMERA)).setValueIndex(0);
-                    findPreference(PreferenceManager.CAMERA).setSummary(PreferenceManager.FRONT);
                     break;
                 case PreferenceManager.BACK:
                     ((ListPreference) findPreference(PreferenceManager.CAMERA)).setValueIndex(1);
-                    findPreference(PreferenceManager.CAMERA).setSummary(PreferenceManager.BACK);
                     break;
                 case PreferenceManager.OFF:
                     ((ListPreference) findPreference(PreferenceManager.CAMERA)).setValueIndex(2);
-                    findPreference(PreferenceManager.CAMERA).setSummary(PreferenceManager.NONE);
                     break;
             }
 

diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
@@ -11,6 +11,7 @@
             android:entries="@array/camera"
             android:entryValues="@array/camera_alias"
             android:key="camera"
+            android:summary="%s"
             android:title="@string/camera_prompt" />
 
         <Preference