diff options
Diffstat (limited to 'src/com/android/camera')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 7 | ||||
| -rw-r--r-- | src/com/android/camera/ui/ModuleSwitcher.java | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index acbf0483a..cbace9e25 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -121,6 +121,8 @@ import com.bumptech.glide.load.engine.executor.FifoPriorityThreadPoolExecutor; import org.codeaurora.snapcam.R; +import org.lineageos.quickreader.ScannerActivity; + import java.io.File; import java.io.IOException; @@ -2056,6 +2058,11 @@ public class CameraActivity extends Activity @Override public void onModuleSelected(int moduleIndex, final Point hotspot) { + if (moduleIndex == ModuleSwitcher.QR_MODULE_INDEX) { + startActivity(new Intent(this, ScannerActivity.class)); + return; + } + mForceReleaseCamera = moduleIndex == ModuleSwitcher.CAPTURE_MODULE_INDEX || (mCamera2enabled && moduleIndex == ModuleSwitcher.PHOTO_MODULE_INDEX); if (mForceReleaseCamera) { diff --git a/src/com/android/camera/ui/ModuleSwitcher.java b/src/com/android/camera/ui/ModuleSwitcher.java index cab75fa7e..4c596d889 100644 --- a/src/com/android/camera/ui/ModuleSwitcher.java +++ b/src/com/android/camera/ui/ModuleSwitcher.java @@ -46,14 +46,16 @@ public class ModuleSwitcher extends RotateImageView { public static final int PHOTO_MODULE_INDEX = 0; public static final int VIDEO_MODULE_INDEX = 1; public static final int WIDE_ANGLE_PANO_MODULE_INDEX = 2; - public static final int LIGHTCYCLE_MODULE_INDEX = 3; - public static final int GCAM_MODULE_INDEX = 4; - public static final int CAPTURE_MODULE_INDEX = 5; + public static final int QR_MODULE_INDEX = 3; + public static final int LIGHTCYCLE_MODULE_INDEX = 4; + public static final int GCAM_MODULE_INDEX = 5; + public static final int CAPTURE_MODULE_INDEX = 6; private static final int[][] DRAW_AND_DESC_IDS = { { R.drawable.ic_switch_camera, R.string.accessibility_switch_to_camera }, { R.drawable.ic_switch_video, R.string.accessibility_switch_to_video }, { R.drawable.ic_switch_pan, R.string.accessibility_switch_to_panorama }, + { R.drawable.ic_cam_switcher_qr, R.string.accessibility_switch_to_qr }, { R.drawable.ic_switch_photosphere, R.string.accessibility_switch_to_photo_sphere }, { R.drawable.ic_switch_gcam, R.string.accessibility_switch_to_gcam } }; |