Make 0 exposure compensation on the seekbar sticky. (f5ab3248) · Commits · e / os / Camera

_docs/history.html

+2 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,8 @@ UPDATED Removed "dim on-screen virtual navigation buttons" option for "Immersive
		UPDATED Changed shutter sound on Samsung devices with Camera2 API (workaround for Samsung specific
		bug where Camera2 API sounds are always 100% volume).
		UPDATED Made upright detection in Panorama photo mode less strict.
		UPDATED Improved exposure compensation seekbar so it's easier to return to an exposure compensation
		of 0.

		Version 1.53.1 (2024/06/04)

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

+62 −3

Original line number	Diff line number	Diff line
		@@ -254,6 +254,9 @@ public class MainActivity extends AppCompatActivity implements PreferenceFragmen
		private long cached_display_rotation_time_ms;
		private int cached_display_rotation;

		List<Integer> exposure_seekbar_values; // mapping from exposure_seekbar value to preview exposure compensation
		private int exposure_seekbar_values_zero; // index in exposure_seekbar_values that maps to zero preview exposure compensation

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		long debug_time = 0;
		@@ -1479,6 +1482,29 @@ public class MainActivity extends AppCompatActivity implements PreferenceFragmen

		public void changeExposure(int change) {
		if( preview.supportsExposures() ) {
		if( exposure_seekbar_values != null ) {
		SeekBar seekBar = this.findViewById(R.id.exposure_seekbar);
		int progress = seekBar.getProgress();
		int new_progress = progress + change;
		int current_exposure = exposure_seekbar_values.get(progress);
		if( exposure_seekbar_values.get(new_progress) == 0 && current_exposure != 0 ) {
		// snap to the central repeated zero
		new_progress = exposure_seekbar_values_zero;
		change = new_progress - progress;
		}
		else {
		// skip over the repeated zeroes
		while( new_progress > 0 && new_progress < exposure_seekbar_values.size()-1 && exposure_seekbar_values.get(new_progress) == current_exposure ) {
		if( change > 0 )
		change++;
		else
		change--;
		new_progress = progress + change;
		if( MyDebug.LOG )
		Log.d(TAG, "skip over constant region: " + new_progress);
		}
		}
		}
		mainUI.changeSeekbar(R.id.exposure_seekbar, change);
		}
		}
		@@ -5908,20 +5934,53 @@ public class MainActivity extends AppCompatActivity implements PreferenceFragmen
		if( MyDebug.LOG )
		Log.d(TAG, "cameraSetup: time after setting up iso: " + (System.currentTimeMillis() - debug_time));
		{
		exposure_seekbar_values = null;
		if( preview.supportsExposures() ) {
		if( MyDebug.LOG )
		Log.d(TAG, "set up exposure compensation");
		final int min_exposure = preview.getMinimumExposure();
		SeekBar exposure_seek_bar = findViewById(R.id.exposure_seekbar);
		exposure_seek_bar.setOnSeekBarChangeListener(null); // clear an existing listener - don't want to call the listener when setting up the progress bar to match the existing state
		exposure_seek_bar.setMax( preview.getMaximumExposure() - min_exposure );
		exposure_seek_bar.setProgress( preview.getCurrentExposure() - min_exposure );

		final int exposure_seekbar_n_repeated_zero = 3; // how many times to repeat 0 for R.id.exposure_seekbar, so that it "sticks" to zero when changing seekbar

		//exposure_seek_bar.setMax( preview.getMaximumExposure() - min_exposure + exposure_seekbar_n_repeated_zero-1 );
		//exposure_seek_bar.setProgress( preview.getCurrentExposure() - min_exposure );

		exposure_seekbar_values = new ArrayList<>();
		int current_exposure = preview.getCurrentExposure();
		int current_progress = 0;
		for(int i=min_exposure;i<=preview.getMaximumExposure();i++) {
		exposure_seekbar_values.add(i);
		if( i == 0 ) {
		exposure_seekbar_values_zero = exposure_seekbar_values.size()-1;
		exposure_seekbar_values_zero += (exposure_seekbar_n_repeated_zero-1)/2; // centre within the region of zeroes
		for(int j=0;j<exposure_seekbar_n_repeated_zero-1;j++) {
		exposure_seekbar_values.add(i);
		}
		}
		if( i == current_exposure ) {
		if( i == 0 ) {
		current_progress += exposure_seekbar_values_zero;
		}
		else {
		current_progress = exposure_seekbar_values.size()-1;
		}
		}
		}
		exposure_seek_bar.setMax( exposure_seekbar_values.size()-1 );
		exposure_seek_bar.setProgress( current_progress );
		exposure_seek_bar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
		@Override
		public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
		if( MyDebug.LOG )
		Log.d(TAG, "exposure seekbar onProgressChanged: " + progress);
		preview.setExposure(min_exposure + progress);
		if( exposure_seekbar_values == null ) {
		Log.e(TAG, "exposure_seekbar_values is null");
		return;
		}
		int new_exposure = exposure_seekbar_values.get(progress);
		preview.setExposure(new_exposure);
		}

		@Override

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -1853,7 +1853,9 @@ public class MainUI {
		changeSeekbar(R.id.exposure_time_seekbar, 5);
		break;
		case 3:
		changeSeekbar(R.id.exposure_seekbar, 1);
		//changeSeekbar(R.id.exposure_seekbar, 1);
		// call via MainActivity.changeExposure(), to handle repeated zeroes
		main_activity.changeExposure(1);
		break;
		case 4:
		changeSeekbar(R.id.white_balance_seekbar, 3);
		@@ -1875,7 +1877,9 @@ public class MainUI {
		changeSeekbar(R.id.exposure_time_seekbar, -5);
		break;
		case 3:
		changeSeekbar(R.id.exposure_seekbar, -1);
		//changeSeekbar(R.id.exposure_seekbar, -1);
		// call via MainActivity.changeExposure(), to handle repeated zeroes
		main_activity.changeExposure(-1);
		break;
		case 4:
		changeSeekbar(R.id.white_balance_seekbar, -3);