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

Commit 567aa781 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

220-Remove_immersive_mode_settings

parent 81ecb88b

app/src/androidTest/java/net/sourceforge/opencamera/test/MainActivityTest.java

+0 −269
Original line number Diff line number Diff line
@@ -4696,275 +4696,6 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv 
        subTestTakePhoto(false, false, true, true, false, false, false, false);

    }









    // If this fails with a SecurityException about needing INJECT_EVENTS permission, this seems to be due to the "help popup" that Android shows - can be fixed by clearing that manually, then rerunning the test.









    public void testImmersiveMode() throws InterruptedException {









        Log.d(TAG, "testImmersiveMode");

















        if( Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT ) {









            Log.d(TAG, "immersive mode requires Android Kitkat or better");









            return;









        }

















        setToDefault();









        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);









        SharedPreferences.Editor editor = settings.edit();









        editor.putString(PreferenceKeys.ImmersiveModePreferenceKey, "immersive_mode_gui");









        editor.putString(PreferenceKeys.AudioControlPreferenceKey, "voice");









        editor.apply();









        updateForSettings();

















        boolean has_audio_control_button = true;

















        View switchCameraButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.switch_camera);









        View switchMultiCameraButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.switch_multi_camera);









        View switchVideoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.switch_video);









        View exposureButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.exposure);









        View exposureLockButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.exposure_lock);









        View audioControlButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.audio_control);









        View popupButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.popup);









        View trashButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.trash);









        View shareButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.share);









        View zoomSeekBar = mActivity.findViewById(net.sourceforge.opencamera.R.id.zoom_seekbar);









        View takePhotoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.take_photo);









        View pauseVideoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.pause_video);









        View takePhotoVideoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.take_photo_when_video_recording);









        assertEquals(switchCameraButton.getVisibility(), (mPreview.getCameraControllerManager().getNumberOfCameras() > 1 ? View.VISIBLE : View.GONE));









        assertEquals(switchMultiCameraButton.getVisibility(), (mActivity.showSwitchMultiCamIcon() ? View.VISIBLE : View.GONE));









        assertEquals(switchVideoButton.getVisibility(), View.VISIBLE);









        int exposureVisibility = exposureButton.getVisibility();









        int exposureLockVisibility = exposureLockButton.getVisibility();









        assertEquals(audioControlButton.getVisibility(), (has_audio_control_button ? View.VISIBLE : View.GONE));









        assertEquals(popupButton.getVisibility(), View.VISIBLE);









        assertEquals(trashButton.getVisibility(), View.GONE);









        assertEquals(shareButton.getVisibility(), View.GONE);









        assertEquals(zoomSeekBar.getVisibility(), View.VISIBLE);









        assertEquals(takePhotoButton.getVisibility(), View.VISIBLE);









        assertEquals(pauseVideoButton.getVisibility(), View.GONE);









        assertEquals(takePhotoVideoButton.getVisibility(), View.GONE);

















        // now wait for immersive mode to kick in









        Thread.sleep(6000);









        assertEquals(switchCameraButton.getVisibility(), View.GONE);









        assertEquals(switchMultiCameraButton.getVisibility(), View.GONE);









        assertEquals(switchVideoButton.getVisibility(), View.GONE);









        assertEquals(exposureButton.getVisibility(), View.GONE);









        assertEquals(exposureLockButton.getVisibility(), View.GONE);









        assertEquals(audioControlButton.getVisibility(), View.GONE);









        assertEquals(popupButton.getVisibility(), View.GONE);









        assertEquals(trashButton.getVisibility(), View.GONE);









        assertEquals(shareButton.getVisibility(), View.GONE);









        assertEquals(zoomSeekBar.getVisibility(), View.GONE);









        assertEquals(takePhotoButton.getVisibility(), View.VISIBLE);









        assertEquals(pauseVideoButton.getVisibility(), View.GONE);









        assertEquals(takePhotoVideoButton.getVisibility(), View.GONE);

















        subTestTakePhoto(false, true, true, true, false, false, false, false);

















        // test now exited immersive mode









        assertEquals(switchCameraButton.getVisibility(), (mPreview.getCameraControllerManager().getNumberOfCameras() > 1 ? View.VISIBLE : View.GONE));









        assertEquals(switchMultiCameraButton.getVisibility(), (mActivity.showSwitchMultiCamIcon() ? View.VISIBLE : View.GONE));









        assertEquals(switchVideoButton.getVisibility(), View.VISIBLE);









        assertEquals(exposureButton.getVisibility(), exposureVisibility);









        assertEquals(exposureLockButton.getVisibility(), exposureLockVisibility);









        assertEquals(audioControlButton.getVisibility(), (has_audio_control_button ? View.VISIBLE : View.GONE));









        assertEquals(popupButton.getVisibility(), View.VISIBLE);









        assertEquals(trashButton.getVisibility(), View.GONE);









        assertEquals(shareButton.getVisibility(), View.GONE);









        assertEquals(zoomSeekBar.getVisibility(), View.VISIBLE);









        assertEquals(takePhotoButton.getVisibility(), View.VISIBLE);









        assertEquals(pauseVideoButton.getVisibility(), View.GONE);









        assertEquals(takePhotoVideoButton.getVisibility(), View.GONE);

















        // wait for immersive mode to kick in again









        Thread.sleep(6000);









        assertEquals(switchCameraButton.getVisibility(), View.GONE);









        assertEquals(switchMultiCameraButton.getVisibility(), View.GONE);









        assertEquals(switchVideoButton.getVisibility(), View.GONE);









        assertEquals(exposureButton.getVisibility(), View.GONE);









        assertEquals(exposureLockButton.getVisibility(), View.GONE);









        assertEquals(audioControlButton.getVisibility(), View.GONE);









        assertEquals(popupButton.getVisibility(), View.GONE);









        assertEquals(trashButton.getVisibility(), View.GONE);









        assertEquals(shareButton.getVisibility(), View.GONE);









        assertEquals(zoomSeekBar.getVisibility(), View.GONE);









        assertEquals(takePhotoButton.getVisibility(), View.VISIBLE);









        assertEquals(pauseVideoButton.getVisibility(), View.GONE);









        assertEquals(takePhotoVideoButton.getVisibility(), View.GONE);

















        subTestTakePhotoPreviewPaused(true, false);

















        // test now exited immersive mode









        assertEquals(switchCameraButton.getVisibility(), (mPreview.getCameraControllerManager().getNumberOfCameras() > 1 ? View.VISIBLE : View.GONE));









        assertEquals(switchMultiCameraButton.getVisibility(), (mActivity.showSwitchMultiCamIcon() ? View.VISIBLE : View.GONE));









        assertEquals(switchVideoButton.getVisibility(), View.VISIBLE);









        assertEquals(exposureButton.getVisibility(), exposureVisibility);









        assertEquals(exposureLockButton.getVisibility(), exposureLockVisibility);









        assertEquals(audioControlButton.getVisibility(), (has_audio_control_button ? View.VISIBLE : View.GONE));









        assertEquals(popupButton.getVisibility(), View.VISIBLE);









        assertEquals(trashButton.getVisibility(), View.GONE);









        assertEquals(shareButton.getVisibility(), View.GONE);









        assertEquals(zoomSeekBar.getVisibility(), View.VISIBLE);









        assertEquals(takePhotoButton.getVisibility(), View.VISIBLE);









        assertEquals(pauseVideoButton.getVisibility(), View.GONE);









        assertEquals(takePhotoVideoButton.getVisibility(), View.GONE);

















        // need to switch video before going back to immersive mode









        if( !mPreview.isVideo() ) {









            clickView(switchVideoButton);









            waitUntilCameraOpened();









        }









        // test now exited immersive mode









        assertEquals(switchCameraButton.getVisibility(), (mPreview.getCameraControllerManager().getNumberOfCameras() > 1 ? View.VISIBLE : View.GONE));









        assertEquals(switchMultiCameraButton.getVisibility(), (mActivity.showSwitchMultiCamIcon() ? View.VISIBLE : View.GONE));









        assertEquals(switchVideoButton.getVisibility(), View.VISIBLE);









        assertEquals(exposureButton.getVisibility(), exposureVisibility);









        assertEquals(exposureLockButton.getVisibility(), exposureLockVisibility);









        assertEquals(audioControlButton.getVisibility(), (has_audio_control_button ? View.VISIBLE : View.GONE));









        assertEquals(popupButton.getVisibility(), View.VISIBLE);









        assertEquals(trashButton.getVisibility(), View.GONE);









        assertEquals(shareButton.getVisibility(), View.GONE);









        assertEquals(zoomSeekBar.getVisibility(), View.VISIBLE);









        assertEquals(takePhotoButton.getVisibility(), View.VISIBLE);









        assertEquals(pauseVideoButton.getVisibility(), View.GONE);









        assertEquals(takePhotoVideoButton.getVisibility(), View.GONE);

















        // wait for immersive mode to kick in again









        Thread.sleep(6000);









        assertEquals(switchCameraButton.getVisibility(), View.GONE);









        assertEquals(switchMultiCameraButton.getVisibility(), View.GONE);









        assertEquals(switchVideoButton.getVisibility(), View.GONE);









        assertEquals(exposureButton.getVisibility(), View.GONE);









        assertEquals(exposureLockButton.getVisibility(), View.GONE);









        assertEquals(audioControlButton.getVisibility(), View.GONE);









        assertEquals(popupButton.getVisibility(), View.GONE);









        assertEquals(trashButton.getVisibility(), View.GONE);









        assertEquals(shareButton.getVisibility(), View.GONE);









        assertEquals(zoomSeekBar.getVisibility(), View.GONE);









        assertEquals(takePhotoButton.getVisibility(), View.VISIBLE);









        assertEquals(pauseVideoButton.getVisibility(), View.GONE);









        assertEquals(takePhotoVideoButton.getVisibility(), View.GONE);

















        subTestTakeVideo(false, false, false, true, null, 5000, false, 0);

















        // test touch exits immersive mode









        TouchUtils.clickView(MainActivityTest.this, mPreview.getView());









        assertEquals(switchCameraButton.getVisibility(), (mPreview.getCameraControllerManager().getNumberOfCameras() > 1 ? View.VISIBLE : View.GONE));









        assertEquals(switchMultiCameraButton.getVisibility(), (mActivity.showSwitchMultiCamIcon() ? View.VISIBLE : View.GONE));









        assertEquals(switchVideoButton.getVisibility(), View.VISIBLE);









        assertEquals(exposureButton.getVisibility(), exposureVisibility);









        assertEquals(exposureLockButton.getVisibility(), exposureLockVisibility);









        assertEquals(audioControlButton.getVisibility(), (has_audio_control_button ? View.VISIBLE : View.GONE));









        assertEquals(popupButton.getVisibility(), View.VISIBLE);









        assertEquals(trashButton.getVisibility(), View.GONE);









        assertEquals(shareButton.getVisibility(), View.GONE);









        assertEquals(zoomSeekBar.getVisibility(), View.VISIBLE);









        assertEquals(takePhotoButton.getVisibility(), View.VISIBLE);









        assertEquals(pauseVideoButton.getVisibility(), View.GONE);









        assertEquals(takePhotoVideoButton.getVisibility(), View.GONE);

















        // switch back to photo mode









        if( mPreview.isVideo() ) {









            clickView(switchVideoButton);









            waitUntilCameraOpened();









        }

















        if( mPreview.usingCamera2API() && mPreview.supportsISORange() ) {









            // now test exposure button disappears when in manual ISO mode









            switchToISO(100);

















            // wait for immersive mode to kick in again









            Thread.sleep(6000);









            assertEquals(switchCameraButton.getVisibility(), View.GONE);









            assertEquals(switchMultiCameraButton.getVisibility(), View.GONE);









            assertEquals(switchVideoButton.getVisibility(), View.GONE);









            assertEquals(exposureButton.getVisibility(), View.GONE);









            assertEquals(exposureLockButton.getVisibility(), View.GONE);









            assertEquals(audioControlButton.getVisibility(), View.GONE);









            assertEquals(popupButton.getVisibility(), View.GONE);









            assertEquals(trashButton.getVisibility(), View.GONE);









            assertEquals(shareButton.getVisibility(), View.GONE);









            assertEquals(zoomSeekBar.getVisibility(), View.GONE);









            assertEquals(takePhotoButton.getVisibility(), View.VISIBLE);









            assertEquals(pauseVideoButton.getVisibility(), View.GONE);









            assertEquals(takePhotoVideoButton.getVisibility(), View.GONE);









        }









    }

















    // See note under testImmersiveMode() if this fails with a SecurityException about needing INJECT_EVENTS permission.









    public void testImmersiveModeEverything() throws InterruptedException {









        Log.d(TAG, "testImmersiveModeEverything");

















        if( Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT ) {









            Log.d(TAG, "immersive mode requires Android Kitkat or better");









            return;









        }

















        setToDefault();









        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);









        SharedPreferences.Editor editor = settings.edit();









        editor.putString(PreferenceKeys.ImmersiveModePreferenceKey, "immersive_mode_everything");









        editor.apply();









        updateForSettings();

















        View switchCameraButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.switch_camera);









        View switchMultiCameraButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.switch_multi_camera);









        View switchVideoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.switch_video);









        View exposureButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.exposure);









        View exposureLockButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.exposure_lock);









        View popupButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.popup);









        View trashButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.trash);









        View shareButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.share);









        View takePhotoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.take_photo);









        View pauseVideoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.pause_video);









        View takePhotoVideoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.take_photo_when_video_recording);









        View zoomSeekBar = mActivity.findViewById(net.sourceforge.opencamera.R.id.zoom_seekbar);









        assertEquals(switchCameraButton.getVisibility(), (mPreview.getCameraControllerManager().getNumberOfCameras() > 1 ? View.VISIBLE : View.GONE));









        assertEquals(switchMultiCameraButton.getVisibility(), (mActivity.showSwitchMultiCamIcon() ? View.VISIBLE : View.GONE));









        assertEquals(switchVideoButton.getVisibility(), View.VISIBLE);









        int exposureVisibility = exposureButton.getVisibility();









        int exposureLockVisibility = exposureLockButton.getVisibility();









        assertEquals(popupButton.getVisibility(), View.VISIBLE);









        assertEquals(trashButton.getVisibility(), View.GONE);









        assertEquals(shareButton.getVisibility(), View.GONE);









        assertEquals(zoomSeekBar.getVisibility(), View.VISIBLE);









        assertEquals(takePhotoButton.getVisibility(), View.VISIBLE);









        assertEquals(pauseVideoButton.getVisibility(), View.GONE);









        assertEquals(takePhotoVideoButton.getVisibility(), View.GONE);

















        // now wait for immersive mode to kick in









        Thread.sleep(6000);









        assertEquals(switchCameraButton.getVisibility(), View.GONE);









        assertEquals(switchMultiCameraButton.getVisibility(), View.GONE);









        assertEquals(switchVideoButton.getVisibility(), View.GONE);









        assertEquals(exposureButton.getVisibility(), View.GONE);









        assertEquals(exposureLockButton.getVisibility(), View.GONE);









        assertEquals(popupButton.getVisibility(), View.GONE);









        assertEquals(trashButton.getVisibility(), View.GONE);









        assertEquals(shareButton.getVisibility(), View.GONE);









        assertEquals(zoomSeekBar.getVisibility(), View.GONE);









        assertEquals(takePhotoButton.getVisibility(), View.GONE);









        assertEquals(pauseVideoButton.getVisibility(), View.GONE);









        assertEquals(takePhotoVideoButton.getVisibility(), View.GONE);

















        // now touch to exit immersive mode









        TouchUtils.clickView(MainActivityTest.this, mPreview.getView());









        Thread.sleep(500);

















        // test now exited immersive mode









        assertEquals(switchCameraButton.getVisibility(), (mPreview.getCameraControllerManager().getNumberOfCameras() > 1 ? View.VISIBLE : View.GONE));









        assertEquals(switchMultiCameraButton.getVisibility(), (mActivity.showSwitchMultiCamIcon() ? View.VISIBLE : View.GONE));









        assertEquals(switchVideoButton.getVisibility(), View.VISIBLE);









        assertEquals(exposureButton.getVisibility(), exposureVisibility);









        assertEquals(exposureLockButton.getVisibility(), exposureLockVisibility);









        assertEquals(popupButton.getVisibility(), View.VISIBLE);









        assertEquals(trashButton.getVisibility(), View.GONE);









        assertEquals(shareButton.getVisibility(), View.GONE);









        assertEquals(zoomSeekBar.getVisibility(), View.VISIBLE);









        assertEquals(takePhotoButton.getVisibility(), View.VISIBLE);









        assertEquals(pauseVideoButton.getVisibility(), View.GONE);









        assertEquals(takePhotoVideoButton.getVisibility(), View.GONE);









    }

















    /** Tests the use of the FLAG_LAYOUT_NO_LIMITS flag introduced in 1.48.









     */









    public void testLayoutNoLimits() throws InterruptedException {
































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



+49
−150




























File changed.
Preview size limit exceeded, changes collapsed.
























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



+28
−36






























Original line number
Diff line number
Diff line









package net.sourceforge.opencamera;



















import java.io.File;









import java.io.FileNotFoundException;









import java.io.FileWriter;









import java.io.IOException;









import java.io.OutputStreamWriter;









import java.util.ArrayList;









import java.util.Calendar;









import java.util.Date;









import java.util.List;









import java.util.Locale;









import java.util.Timer;









import java.util.TimerTask;



















import net.sourceforge.opencamera.cameracontroller.CameraController;









import net.sourceforge.opencamera.cameracontroller.RawImage;









import net.sourceforge.opencamera.preview.ApplicationInterface;









import net.sourceforge.opencamera.preview.BasicApplicationInterface;









import net.sourceforge.opencamera.preview.Preview;









import net.sourceforge.opencamera.preview.VideoProfile;









import net.sourceforge.opencamera.ui.CircleImageView;









import net.sourceforge.opencamera.ui.DrawPreview;



















import android.annotation.TargetApi;









import android.app.Activity;









import android.content.Context;









import android.content.Intent;









import android.content.SharedPreferences;









import android.content.res.ColorStateList;









import android.graphics.Bitmap;









import android.graphics.Canvas;









import android.graphics.Color;








@@ -55,6 +32,28 @@ import android.view.MotionEvent;







import android.view.View;









import android.widget.ImageButton;



















import net.sourceforge.opencamera.cameracontroller.CameraController;









import net.sourceforge.opencamera.cameracontroller.RawImage;









import net.sourceforge.opencamera.preview.ApplicationInterface;









import net.sourceforge.opencamera.preview.BasicApplicationInterface;









import net.sourceforge.opencamera.preview.Preview;









import net.sourceforge.opencamera.preview.VideoProfile;









import net.sourceforge.opencamera.ui.CircleImageView;









import net.sourceforge.opencamera.ui.DrawPreview;



















import java.io.File;









import java.io.FileNotFoundException;









import java.io.FileWriter;









import java.io.IOException;









import java.io.OutputStreamWriter;









import java.util.ArrayList;









import java.util.Calendar;









import java.util.Date;









import java.util.List;









import java.util.Locale;









import java.util.Timer;









import java.util.TimerTask;



















import foundation.e.camera.R;



















/** Our implementation of ApplicationInterface, see there for details.








@@ -1854,9 +1853,6 @@ public class MyApplicationInterface extends BasicApplicationInterface {







    public void touchEvent(MotionEvent event) {









        main_activity.getMainUI().closeExposureUI();









        main_activity.getMainUI().closePopup();









        if( main_activity.usingKitKatImmersiveMode() ) {









            main_activity.setImmersiveMode(false);









        }









    }



















    @Override








@@ -1877,18 +1873,14 @@ public class MyApplicationInterface extends BasicApplicationInterface {







        if( MyDebug.LOG )









            Log.d(TAG, "startedVideo()");









        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {









            if( !( main_activity.getMainUI().inImmersiveMode() && main_activity.usingKitKatImmersiveModeEverything() ) ) {









            View pauseVideoButton = main_activity.findViewById(R.id.pause_video);









            pauseVideoButton.setVisibility(View.VISIBLE);









            }









            main_activity.getMainUI().setPauseVideoContentDescription();









        }









        if (main_activity.getPreview().supportsPhotoVideoRecording() && this.usePhotoVideoRecording()) {









            if( !( main_activity.getMainUI().inImmersiveMode() && main_activity.usingKitKatImmersiveModeEverything() ) ) {









            View takePhotoVideoButton = main_activity.findViewById(R.id.take_photo_when_video_recording);









            takePhotoVideoButton.setVisibility(View.VISIBLE);









        }









        }









        if( main_activity.getMainUI().isExposureUIOpen() ) {









            if( MyDebug.LOG )









                Log.d(TAG, "need to update exposure UI for start video recording");
































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



+0
−7






























Original line number
Diff line number
Diff line







@@ -597,13 +597,6 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared







            pg.removePreference(pref);









        }



















        if( Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT ) {









            // Some immersive modes require KITKAT - simpler to require Kitkat for any of the menu options









            Preference pref = findPreference("preference_immersive_mode");









            PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_screen_gui");









            pg.removePreference(pref);









        }



















        if( !using_android_l ) {









            Preference pref = findPreference("preference_focus_assist");









            PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_preview");
































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



+0
−1






























Original line number
Diff line number
Diff line







@@ -350,6 +350,5 @@ public class PreferenceKeys {

















    public static final String ShutterSoundPreferenceKey = "preference_shutter_sound";



















    public static final String ImmersiveModePreferenceKey = "preference_immersive_mode";









    public static final String AddYPRToComments="preference_comment_ypr";









}