Add QRCode toast (421a3cff) · Commits · e / os / Camera

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

+78 −75

Original line number	Diff line number	Diff line
		@@ -6258,7 +6258,7 @@ public class MainActivity extends AppCompatActivity {
		simple = false;
		}
		}
		else {
		else { //Camera
		if( photo_mode == MyApplicationInterface.PhotoMode.Panorama ) {
		// don't show resolution in panorama mode
		toast_string = "";
		@@ -6292,6 +6292,9 @@ public class MainActivity extends AppCompatActivity {
		simple = false;
		}
		}
		if (preview.isQRCode()) {
		toast_string = "QRCode";
		} else { //Camera \|\| Video
		if (applicationInterface.getFaceDetectionPref()) {
		// important so that the user realises why touching for focus/metering areas won't work - easy to forget that face detection has been turned on!
		toast_string += "\n" + getResources().getString(R.string.preference_face_detection);
		@@ -6333,8 +6336,7 @@ public class MainActivity extends AppCompatActivity {
		toast_string += "\n" + getResources().getString(R.string.color_effect) + ": " + mainUI.getEntryForColorEffect(color_effect);
		simple = false;
		}
		}
		catch(RuntimeException e) {
		} catch (RuntimeException e) {
		// catch runtime error from camera_controller old API from camera.getParameters()
		e.printStackTrace();
		}
		@@ -6375,6 +6377,7 @@ public class MainActivity extends AppCompatActivity {
		/*if( audio_listener != null ) {
		toast_string += "\n" + getResources().getString(R.string.preference_audio_noise_control);
		}*/
		}

		if( MyDebug.LOG ) {
		Log.d(TAG, "toast_string: " + toast_string);