Skip to content

Commit 59cd2b8

Browse files
author
Dan Oprea
committed
Remove EdgeEnhancement option (useless for real usage)
1 parent 6e8b1bf commit 59cd2b8

File tree

4 files changed

+2
-13
lines changed

4 files changed

+2
-13
lines changed

app/src/main/java/com/dan/simplerawcamera/CameraActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,7 +1415,7 @@ class CameraActivity : AppCompatActivity() {
14151415

14161416
if (photoMode) {
14171417
captureRequestBuilder.set(CaptureRequest.COLOR_CORRECTION_ABERRATION_MODE, CaptureRequest.COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY)
1418-
captureRequestBuilder.set(CaptureRequest.EDGE_MODE, if(settings.edgeEnhancement) CaptureRequest.EDGE_MODE_HIGH_QUALITY else CaptureRequest.EDGE_MODE_OFF)
1418+
captureRequestBuilder.set(CaptureRequest.EDGE_MODE, CaptureRequest.EDGE_MODE_HIGH_QUALITY)
14191419
captureRequestBuilder.set(CaptureRequest.HOT_PIXEL_MODE, CaptureRequest.HOT_PIXEL_MODE_HIGH_QUALITY)
14201420
captureRequestBuilder.set(CaptureRequest.CONTROL_CAPTURE_INTENT, CaptureRequest.CONTROL_CAPTURE_INTENT_STILL_CAPTURE)
14211421
captureRequestBuilder.set(CaptureRequest.FLASH_MODE, getFlashModeValue(false))
@@ -1477,7 +1477,7 @@ class CameraActivity : AppCompatActivity() {
14771477
captureRequestBuilder.removeTarget(mImageReaderJpeg.surface)
14781478

14791479
captureRequestBuilder.set(CaptureRequest.COLOR_CORRECTION_ABERRATION_MODE, CaptureRequest.COLOR_CORRECTION_ABERRATION_MODE_FAST)
1480-
captureRequestBuilder.set(CaptureRequest.EDGE_MODE, if(settings.edgeEnhancement) CaptureRequest.EDGE_MODE_FAST else CaptureRequest.EDGE_MODE_OFF)
1480+
captureRequestBuilder.set(CaptureRequest.EDGE_MODE, CaptureRequest.EDGE_MODE_FAST)
14811481
captureRequestBuilder.set(CaptureRequest.HOT_PIXEL_MODE, CaptureRequest.HOT_PIXEL_MODE_FAST)
14821482
captureRequestBuilder.set(CaptureRequest.CONTROL_CAPTURE_INTENT, CaptureRequest.CONTROL_CAPTURE_INTENT_PREVIEW)
14831483
captureRequestBuilder.set(

app/src/main/java/com/dan/simplerawcamera/Settings.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ class Settings( private val activity: Activity) {
7878
var flashMode: Int = FLASH_MODE_OFF
7979
var enableHapticFeedback = true
8080
var useLocation = true
81-
var edgeEnhancement = true;
8281

8382
init {
8483
loadProperties()

app/src/main/java/com/dan/simplerawcamera/SettingsDialog.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ class SettingsDialog(private val cameraActivity: CameraActivity, private val lis
4242
binding.switchShowDebugInfo.isChecked = cameraActivity.settings.showDebugInfo
4343
binding.switchLocation.isChecked = cameraActivity.settings.useLocation
4444
binding.switchHapticFeedback.isChecked = cameraActivity.settings.enableHapticFeedback
45-
binding.switchEdgeEnhancement.isChecked = cameraActivity.settings.edgeEnhancement
4645

4746
binding.btnSelectFolder.setOnClickListener {
4847
cameraActivity.startSelectFolder()
@@ -59,7 +58,6 @@ class SettingsDialog(private val cameraActivity: CameraActivity, private val lis
5958
cameraActivity.settings.showDebugInfo = binding.switchShowDebugInfo.isChecked
6059
cameraActivity.settings.useLocation = binding.switchLocation.isChecked
6160
cameraActivity.settings.enableHapticFeedback = binding.switchHapticFeedback.isChecked
62-
cameraActivity.settings.edgeEnhancement = binding.switchEdgeEnhancement.isChecked
6361

6462
cameraActivity.settings.saveProperties()
6563

app/src/main/res/layout/settings.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,6 @@
213213
android:spinnerMode="dropdown" />
214214
</LinearLayout>
215215

216-
<Switch
217-
android:id="@+id/switchEdgeEnhancement"
218-
android:layout_width="match_parent"
219-
android:layout_height="wrap_content"
220-
android:paddingTop="10dp"
221-
android:paddingBottom="10dp"
222-
android:text="Edge enhancement:" />
223-
224216
<Switch
225217
android:id="@+id/switchHapticFeedback"
226218
android:layout_width="match_parent"

0 commit comments

Comments
 (0)