summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--quickReader/res/drawable/ic_cam_switcher_qr.xml24
-rw-r--r--quickReader/res/values/strings.xml3
-rw-r--r--src/com/android/camera/CameraActivity.java8
-rw-r--r--src/com/android/camera/ui/ModuleSwitcher.java13
4 files changed, 44 insertions, 4 deletions
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 0000000..eaf247f
--- /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 7be2b6f..8974831 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 c28cc95..b48a232 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -120,6 +120,8 @@ import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper;
import com.android.camera.util.UsageStatistics;
import org.codeaurora.snapcam.R;
+import org.lineageos.quickreader.ScannerActivity;
+
import java.io.File;
import java.io.IOException;
@@ -2141,6 +2143,12 @@ public class CameraActivity extends Activity
@Override
public void onModuleSelected(int moduleIndex) {
+ if (moduleIndex == ModuleSwitcher.QR_MODULE_INDEX) {
+ startActivity(new Intent(this, ScannerActivity.class));
+ finish();
+ 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 e9a9a54..8b4797f 100644
--- a/src/com/android/camera/ui/ModuleSwitcher.java
+++ b/src/com/android/camera/ui/ModuleSwitcher.java
@@ -51,10 +51,11 @@ 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 PANOCAPTURE_MODULE_INDEX = 6;
+ 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;
+ public static final int PANOCAPTURE_MODULE_INDEX = 7;
private boolean mTouchEnabled = true;
private boolean mIsVisible = true;
@@ -63,6 +64,7 @@ public class ModuleSwitcher extends RotateImageView
R.drawable.ic_switch_camera,
R.drawable.ic_switch_video,
R.drawable.ic_switch_pan,
+ R.drawable.ic_cam_switcher_qr,
R.drawable.ic_switch_photosphere,
R.drawable.ic_switch_gcam,
};
@@ -231,6 +233,9 @@ public class ModuleSwitcher extends RotateImageView
item.setContentDescription(getContext().getResources().getString(
R.string.accessibility_switch_to_panorama));
break;
+ case R.drawable.ic_cam_switcher_qr:
+ item.setContentDescription(getContext().getResources().getString(
+ R.string.accessibility_switch_to_qr));
case R.drawable.ic_switch_photosphere:
item.setContentDescription(getContext().getResources().getString(
R.string.accessibility_switch_to_photo_sphere));