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

Commit 10bd1e0c authored by Doris Liu's avatar Doris Liu Committed by Android (Google) Code Review
Browse files

Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce

parents 560f959b 29002527

src/com/android/camera/VideoModule.java

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ public class VideoModule implements CameraModule, 


    @Override

    public void onShutterButtonFocus(boolean pressed) {

        // Do nothing (everything happens in onShutterButtonClick).

        mUI.setShutterPressed(pressed);

    }



    private void readVideoPreferences() {

src/com/android/camera/VideoUI.java

+6 −0
Original line number Diff line number Diff line
@@ -320,6 +320,12 @@ public class VideoUI implements SurfaceHolder.Callback, PieRenderer.PieListener, 
        return false;

    }



    // disable preview gestures after shutter is pressed

    public void setShutterPressed(boolean pressed) {

        if (mGestures == null) return;

        mGestures.setEnabled(!pressed);

    }



    public void enableShutter(boolean enable) {

        if (mShutterButton != null) {

            mShutterButton.setEnabled(enable);