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

Commit 86379b3d authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Revert "229-Optimize_preview_when_taking_picture" 

This reverts commit fc77de9f.
parent 00608820

app/src/main/java/net/sourceforge/opencamera/PreferenceSubPhoto.java

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public class PreferenceSubPhoto extends PreferenceSubScreen { 
        if( MyDebug.LOG )

            Log.d(TAG, "supports_photo_video_recording: " + supports_photo_video_recording);



        if( false && widths != null && heights != null && supports_burst != null ) {

        if( widths != null && heights != null && supports_burst != null ) {

            CharSequence [] entries = new CharSequence[widths.length];

            CharSequence [] values = new CharSequence[widths.length];

            for(int i=0;i<widths.length;i++) {

app/src/main/java/net/sourceforge/opencamera/preview/Preview.java

+0 −5
Original line number Diff line number Diff line
@@ -4056,11 +4056,6 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu 
                Log.d(TAG, "no preview size matches the aspect ratio");

            optimalSize = getClosestSize(sizes, targetRatio, null);

        }



        if (((MainActivity)getContext()).isInFullScreenMode()) {

            camera_controller.setPictureSize(optimalSize.width, optimalSize.height);

        }



        if( MyDebug.LOG ) {

            Log.d(TAG, "chose optimalSize: " + optimalSize.width + " x " + optimalSize.height);

            Log.d(TAG, "optimalSize ratio: " + ((double)optimalSize.width / optimalSize.height));

app/src/main/java/net/sourceforge/opencamera/ui/PopupView.java

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ public class PopupView extends LinearLayout { 
            if( MyDebug.LOG )

                Log.d(TAG, "PopupView time 8: " + (System.nanoTime() - debug_time));



            if( !preview.isVideo() && photo_mode != MyApplicationInterface.PhotoMode.Panorama && !main_activity.isInFullScreenMode()) {

            if( !preview.isVideo() && photo_mode != MyApplicationInterface.PhotoMode.Panorama ) {

                // Only show photo resolutions in photo mode - even if photo snapshots whilst recording video is supported, the

                // resolutions for that won't match what the user has requested for photo mode resolutions.

                // And Panorama mode chooses its own resolution.