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

Commit 38959a87 authored by Mark Harman's avatar Mark Harman
Browse files

Support "Touch to capture" for video.

parent 33074511
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -491,9 +491,8 @@ Fast Burst photo mode, or long press the "take photo" button in Standard or Fast

<p><b>More camera controls...</b> - Select to access the following controls:</p>

<p><b>Touch to capture</b> - This option allows you to take a photo either just by touching or double-tapping on the
preview screen. Note that starting/stopping video recording is still performed in the normal way; this option only
affects taking photos.</p>
<p><b>Touch to capture</b> - This option allows you to take a photo, or start and stop video recording,
    just by either touching or double-tapping on the preview screen.</p>

<p><b>Pause after taking photo</b> - If ticked, after taking a photo the display will pause, with options to share
<img src="share.png" alt="Share icon" width="32" height="32"> or delete
+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ FIXED Aspect ratio and other fixes in split-screen and multi-window modes.
ADDED   Support for zoom with camera vendor extensions (for supported Android 13+ devices).
ADDED   Support for displaying on-screen ISO and exposure time with camera vendor extensions (for
        supported Android 13+ devices).
UPDATED "Touch to capture" option now supports starting and stopping video.
UPDATED Applied a timeout of 2 second for focusing with original camera API.
UPDATED Improved performance for NR photo mode.
UPDATED Drop support for notifications for background saving, due to Android 13 permissions faff.
+2 −2
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
        }

        // don't take a photo on touch if the user is touching to unpause!
        if( !this.is_video && !was_paused && touch_capture ) {
        if( !was_paused && touch_capture ) {
            if( MyDebug.LOG )
                Log.d(TAG, "touch to capture");
            // Interpret as if user had clicked take photo/video button, except that we set the focus/metering areas.
@@ -826,7 +826,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
    /** Returns whether we will take a photo on a double tap.
     */
    private boolean takePhotoOnDoubleTap() {
        return !is_video && applicationInterface.getDoubleTapCapturePref();
        return applicationInterface.getDoubleTapCapturePref();
    }

    @SuppressWarnings("SameReturnValue")
+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@
    <string name="preference_burst_interval">Repeat mode interval</string>
    <string name="preference_screen_camera_controls_more">More camera controls…</string>
    <string name="preference_touch_capture">Touch to capture</string>
    <string name="preference_touch_capture_summary">Take a photo just by touching or double-tapping the preview</string>
    <string name="preference_touch_capture_summary">Take a photo or record video just by touching or double-tapping the preview</string>
    <string name="preference_pause_preview">Pause after taking photo</string>
    <string name="preference_pause_preview_summary">Pause the screen after taking a photo, with the option to share or delete the photo</string>
    <string name="preference_shutter_sound">Shutter sound</string>