Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57d7fa42 authored by Mark Harman's avatar Mark Harman
Browse files

Merge commit 'eed60be7'

parents 316ba10a eed60be7
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,8 @@ public class PreferenceKeys {

    public static final String SaveZuluTimePreferenceKey = "preference_save_zulu_time";

    public static final String SaveIncludeMillisecondsPreferenceKey = "preference_save_include_milliseconds";

    public static final String ShowZoomControlsPreferenceKey = "preference_show_zoom_controls";

    public static final String ShowZoomSliderControlsPreferenceKey = "preference_show_zoom_slider_controls";
+7 −2
Original line number Diff line number Diff line
@@ -690,14 +690,19 @@ public class StorageUtils {
        }
        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
        boolean useZuluTime = sharedPreferences.getString(PreferenceKeys.SaveZuluTimePreferenceKey, "local").equals("zulu");
        boolean includeMilliseconds = sharedPreferences.getBoolean(PreferenceKeys.SaveIncludeMillisecondsPreferenceKey, false);
        String dateFormatPattern = "yyyyMMdd_HHmmss";
        if(includeMilliseconds) {
            dateFormatPattern += ".SSS";
        }
        String timeStamp;
        if( useZuluTime ) {
            SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd_HHmmss'Z'", Locale.US);
            SimpleDateFormat fmt = new SimpleDateFormat(dateFormatPattern+"'Z'", Locale.US);
            fmt.setTimeZone(TimeZone.getTimeZone("UTC"));
            timeStamp = fmt.format(current_date);
        }
        else {
            timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(current_date);
            timeStamp = new SimpleDateFormat(dateFormatPattern, Locale.US).format(current_date);
        }
        String mediaFilename;
        switch (type) {
+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@
    <string name="preference_save_video_prefix">Save video prefix</string>
    <string name="preference_save_video_prefix_summary">The prefix to use for the save filenames for videos</string>
    <string name="preference_save_zulu_time">Time format for filename</string>
    <string name="preference_save_include_milliseconds">Use milliseconds in filename</string>
    <string name="preference_save_include_milliseconds_summary">If enabled, filenames will include milliseconds</string>
    <string name="preference_show_when_locked">Show camera when locked</string>
    <string name="preference_show_when_locked_summary">If enabled, Open Camera will still show above any lockscreen (you\'ll still have to unlock to access Settings, Gallery etc)</string>
    <string name="preference_startup_focus">Perform auto-focus on startup</string>
+7 −0
Original line number Diff line number Diff line
@@ -137,6 +137,13 @@
        android:defaultValue="local"
        />

    <SwitchPreference
        android:key="preference_save_include_milliseconds"
        android:title="@string/preference_save_include_milliseconds"
        android:summary="@string/preference_save_include_milliseconds_summary"
        android:defaultValue="false"
        />

    <SwitchPreference
        android:key="preference_allow_haptic_feedback"
        android:title="@string/preference_allow_haptic_feedback"