From c89f3ae74269284a8658e57560d0ab0797a072d4 Mon Sep 17 00:00:00 2001
From: Joey Rizzoli <joey@lineageos.org>
Date: Fri, 15 Dec 2017 21:54:27 +0100
Subject: Snap: add QReader to module switch

Change-Id: I7cc33c7ebc6de35d19979a9a70f198029e46d88f
Signed-off-by: Joey Rizzoli <joey@lineageos.org>
---
 quickReader/res/drawable/ic_cam_switcher_qr.xml | 24 ++++++++++++++++++++++++
 quickReader/res/values/strings.xml              |  3 +++
 src/com/android/camera/CameraActivity.java      |  7 +++++++
 src/com/android/camera/ui/ModuleSwitcher.java   |  8 +++++---
 4 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 quickReader/res/drawable/ic_cam_switcher_qr.xml

diff --git a/quickReader/res/drawable/ic_cam_switcher_qr.xml b/quickReader/res/drawable/ic_cam_switcher_qr.xml
new file mode 100644
index 000000000..eaf247f9e
--- /dev/null
+++ b/quickReader/res/drawable/ic_cam_switcher_qr.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2017 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#fafafa"
+        android:pathData="M3,11H5V13H3V11M11,5H13V9H11V5M9,11H13V15H11V13H9V11M15,11H17V13H19V11H21V13H19V15H21V19H19V21H17V19H13V21H11V17H15V15H17V13H15V11M19,19V15H17V19H19M15,3H21V9H15V3M17,5V7H19V5H17M3,3H9V9H3V3M5,5V7H7V5H5M3,15H9V21H3V15M5,17V19H7V17H5Z" />
+</vector>
\ No newline at end of file
diff --git a/quickReader/res/values/strings.xml b/quickReader/res/values/strings.xml
index 7be2b6f91..897483115 100644
--- a/quickReader/res/values/strings.xml
+++ b/quickReader/res/values/strings.xml
@@ -16,6 +16,9 @@
 <resources>
     <string name="quick_reader_name" translatable="false">QReader</string>
 
+    <!-- QuickReader: switcher item for qr -->
+    <string name="accessibility_switch_to_qr">QR reader</string>
+
     <!-- QuickReader: dismiss button for dialogs -->
     <string name="quick_reader_action_dismiss">Dismiss</string>
     <!-- QuickReader: toast shown when there's no app installed to open the qr code content -->
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 }
     };
-- 
cgit v1.2.3