[LeAudio] Remove the QrCamera and decorateView in Settings
Bug: 214340362
Test: Manual test
Change-Id: Ibc29f0e90af28e14a11164fa8940920745545c7e
diff --git a/res/layout-land/adb_qrcode_scanner_fragment.xml b/res/layout-land/adb_qrcode_scanner_fragment.xml
index 6451551..a2c0110 100644
--- a/res/layout-land/adb_qrcode_scanner_fragment.xml
+++ b/res/layout-land/adb_qrcode_scanner_fragment.xml
@@ -45,7 +45,7 @@
android:id="@+id/preview_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
- <com.android.settings.wifi.qrcode.QrDecorateView
+ <com.android.settingslib.qrcode.QrDecorateView
android:id="@+id/decorate_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
diff --git a/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml b/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
index 7428749..11bb0ae 100644
--- a/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
+++ b/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
@@ -44,7 +44,7 @@
android:id="@+id/preview_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
- <com.android.settings.wifi.qrcode.QrDecorateView
+ <com.android.settingslib.qrcode.QrDecorateView
android:id="@+id/decorate_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
diff --git a/res/layout/adb_qrcode_scanner_fragment.xml b/res/layout/adb_qrcode_scanner_fragment.xml
index 7823155..98c2122 100644
--- a/res/layout/adb_qrcode_scanner_fragment.xml
+++ b/res/layout/adb_qrcode_scanner_fragment.xml
@@ -45,7 +45,7 @@
android:id="@+id/preview_view"
android:layout_width="match_parent"
android:layout_height="@dimen/qrcode_preview_size"/>
- <com.android.settings.wifi.qrcode.QrDecorateView
+ <com.android.settingslib.qrcode.QrDecorateView
android:id="@+id/decorate_view"
android:layout_width="match_parent"
android:layout_height="@dimen/qrcode_preview_size"/>
diff --git a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
index 380fc8a..dd96d7e 100644
--- a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
+++ b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
@@ -44,7 +44,7 @@
android:id="@+id/preview_view"
android:layout_width="match_parent"
android:layout_height="@dimen/qrcode_preview_size"/>
- <com.android.settings.wifi.qrcode.QrDecorateView
+ <com.android.settingslib.qrcode.QrDecorateView
android:id="@+id/decorate_view"
android:layout_width="match_parent"
android:layout_height="@dimen/qrcode_preview_size"/>
diff --git a/src/com/android/settings/development/AdbQrcodeScannerFragment.java b/src/com/android/settings/development/AdbQrcodeScannerFragment.java
index d53f649..afbb8e4 100644
--- a/src/com/android/settings/development/AdbQrcodeScannerFragment.java
+++ b/src/com/android/settings/development/AdbQrcodeScannerFragment.java
@@ -48,8 +48,8 @@
import com.android.settings.wifi.dpp.AdbQrCode;
import com.android.settings.wifi.dpp.WifiDppQrCodeBaseFragment;
import com.android.settings.wifi.dpp.WifiNetworkConfig;
-import com.android.settings.wifi.qrcode.QrCamera;
-import com.android.settings.wifi.qrcode.QrDecorateView;
+import com.android.settingslib.qrcode.QrCamera;
+import com.android.settingslib.qrcode.QrDecorateView;
import com.google.android.setupdesign.util.ThemeHelper;
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
index 528fbc3..f313f6b 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
@@ -56,8 +56,8 @@
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.wifi.qrcode.QrCamera;
-import com.android.settings.wifi.qrcode.QrDecorateView;
+import com.android.settingslib.qrcode.QrCamera;
+import com.android.settingslib.qrcode.QrDecorateView;
import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiPickerTracker;
diff --git a/src/com/android/settings/wifi/qrcode/QrCamera.java b/src/com/android/settings/wifi/qrcode/QrCamera.java
deleted file mode 100644
index d07c543..0000000
--- a/src/com/android/settings/wifi/qrcode/QrCamera.java
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source 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
- */
-
-package com.android.settings.wifi.qrcode;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import android.graphics.Matrix;
-import android.graphics.Rect;
-import android.graphics.SurfaceTexture;
-import android.hardware.Camera;
-import android.hardware.Camera.CameraInfo;
-import android.hardware.Camera.Parameters;
-import android.os.AsyncTask;
-import android.os.Handler;
-import android.os.Message;
-import android.util.ArrayMap;
-import android.util.Log;
-import android.util.Size;
-import android.view.Surface;
-import android.view.WindowManager;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.BinaryBitmap;
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.MultiFormatReader;
-import com.google.zxing.ReaderException;
-import com.google.zxing.Result;
-import com.google.zxing.common.HybridBinarizer;
-
-import java.io.IOException;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Semaphore;
-
-/**
- * Manage the camera for the QR scanner and help the decoder to get the image inside the scanning
- * frame. Caller prepares a {@link SurfaceTexture} then call {@link #start(SurfaceTexture)} to
- * start QR Code scanning. The scanning result will return by ScannerCallback interface. Caller
- * can also call {@link #stop()} to halt QR Code scanning before the result returned.
- */
-public class QrCamera extends Handler {
- private static final String TAG = "QrCamera";
-
- private static final int MSG_AUTO_FOCUS = 1;
-
- /**
- * The max allowed difference between picture size ratio and preview size ratio.
- * Uses to filter the picture sizes of similar preview size ratio, for example, if a preview
- * size is 1920x1440, MAX_RATIO_DIFF 0.1 could allow picture size of 720x480 or 352x288 or
- * 176x44 but not 1920x1080.
- */
- private static final double MAX_RATIO_DIFF = 0.1;
-
- private static final long AUTOFOCUS_INTERVAL_MS = 1500L;
-
- private static Map<DecodeHintType, List<BarcodeFormat>> HINTS = new ArrayMap<>();
- private static List<BarcodeFormat> FORMATS = new ArrayList<>();
-
- static {
- FORMATS.add(BarcodeFormat.QR_CODE);
- HINTS.put(DecodeHintType.POSSIBLE_FORMATS, FORMATS);
- }
-
- @VisibleForTesting
- Camera mCamera;
- private Size mPreviewSize;
- private WeakReference<Context> mContext;
- private ScannerCallback mScannerCallback;
- private MultiFormatReader mReader;
- private DecodingTask mDecodeTask;
- private int mCameraOrientation;
- @VisibleForTesting
- Camera.Parameters mParameters;
-
- public QrCamera(Context context, ScannerCallback callback) {
- mContext = new WeakReference<Context>(context);
- mScannerCallback = callback;
- mReader = new MultiFormatReader();
- mReader.setHints(HINTS);
- }
-
- /**
- * The function start camera preview and capture pictures to decode QR code continuously in a
- * background task.
- *
- * @param surface The surface to be used for live preview.
- */
- public void start(SurfaceTexture surface) {
- if (mDecodeTask == null) {
- mDecodeTask = new DecodingTask(surface);
- // Execute in the separate thread pool to prevent block other AsyncTask.
- mDecodeTask.executeOnExecutor(Executors.newSingleThreadExecutor());
- }
- }
-
- /**
- * The function stop camera preview and background decode task. Caller call this function when
- * the surface is being destroyed.
- */
- public void stop() {
- removeMessages(MSG_AUTO_FOCUS);
- if (mDecodeTask != null) {
- mDecodeTask.cancel(true);
- mDecodeTask = null;
- }
- if (mCamera != null) {
- mCamera.stopPreview();
- releaseCamera();
- }
- }
-
- /** The scanner which includes this QrCamera class should implement this */
- public interface ScannerCallback {
-
- /**
- * The function used to handle the decoding result of the QR code.
- *
- * @param result the result QR code after decoding.
- */
- void handleSuccessfulResult(String result);
-
- /** Request the QR code scanner to handle the failure happened. */
- void handleCameraFailure();
-
- /**
- * The function used to get the background View size.
- *
- * @return Includes the background view size.
- */
- Size getViewSize();
-
- /**
- * The function used to get the frame position inside the view
- *
- * @param previewSize Is the preview size set by camera
- * @param cameraOrientation Is the orientation of current Camera
- * @return The rectangle would like to crop from the camera preview shot.
- */
- Rect getFramePosition(Size previewSize, int cameraOrientation);
-
- /**
- * Sets the transform to associate with preview area.
- *
- * @param transform The transform to apply to the content of preview
- */
- void setTransform(Matrix transform);
-
- /**
- * Verify QR code is valid or not. The camera will stop scanning if this callback returns
- * true.
- *
- * @param qrCode The result QR code after decoding.
- * @return Returns true if qrCode hold valid information.
- */
- boolean isValid(String qrCode);
- }
-
- @VisibleForTesting
- void setCameraParameter() {
- mParameters = mCamera.getParameters();
- mPreviewSize = getBestPreviewSize(mParameters);
- mParameters.setPreviewSize(mPreviewSize.getWidth(), mPreviewSize.getHeight());
- Size pictureSize = getBestPictureSize(mParameters);
- mParameters.setPictureSize(pictureSize.getWidth(), pictureSize.getHeight());
-
- final List<String> supportedFlashModes = mParameters.getSupportedFlashModes();
- if (supportedFlashModes != null &&
- supportedFlashModes.contains(Parameters.FLASH_MODE_OFF)) {
- mParameters.setFlashMode(Parameters.FLASH_MODE_OFF);
- }
-
- final List<String> supportedFocusModes = mParameters.getSupportedFocusModes();
- if (supportedFocusModes.contains(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) {
- mParameters.setFocusMode(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
- } else if (supportedFocusModes.contains(Parameters.FOCUS_MODE_AUTO)) {
- mParameters.setFocusMode(Parameters.FOCUS_MODE_AUTO);
- }
- mCamera.setParameters(mParameters);
- }
-
- private boolean startPreview() {
- if (mContext.get() == null) {
- return false;
- }
-
- final WindowManager winManager =
- (WindowManager) mContext.get().getSystemService(Context.WINDOW_SERVICE);
- final int rotation = winManager.getDefaultDisplay().getRotation();
- int degrees = 0;
- switch (rotation) {
- case Surface.ROTATION_0:
- degrees = 0;
- break;
- case Surface.ROTATION_90:
- degrees = 90;
- break;
- case Surface.ROTATION_180:
- degrees = 180;
- break;
- case Surface.ROTATION_270:
- degrees = 270;
- break;
- }
- final int rotateDegrees = (mCameraOrientation - degrees + 360) % 360;
- mCamera.setDisplayOrientation(rotateDegrees);
- mCamera.startPreview();
- if (Parameters.FOCUS_MODE_AUTO.equals(mParameters.getFocusMode())) {
- mCamera.autoFocus(/* Camera.AutoFocusCallback */ null);
- sendMessageDelayed(obtainMessage(MSG_AUTO_FOCUS), AUTOFOCUS_INTERVAL_MS);
- }
- return true;
- }
-
- private class DecodingTask extends AsyncTask<Void, Void, String> {
- private QrYuvLuminanceSource mImage;
- private SurfaceTexture mSurface;
-
- private DecodingTask(SurfaceTexture surface) {
- mSurface = surface;
- }
-
- @Override
- protected String doInBackground(Void... tmp) {
- if (!initCamera(mSurface)) {
- return null;
- }
-
- final Semaphore imageGot = new Semaphore(0);
- while (true) {
- // This loop will try to capture preview image continuously until a valid QR Code
- // decoded. The caller can also call {@link #stop()} to interrupts scanning loop.
- mCamera.setOneShotPreviewCallback(
- (imageData, camera) -> {
- mImage = getFrameImage(imageData);
- imageGot.release();
- });
- try {
- // Semaphore.acquire() blocking until permit is available, or the thread is
- // interrupted.
- imageGot.acquire();
- Result qrCode = null;
- try {
- qrCode =
- mReader.decodeWithState(
- new BinaryBitmap(new HybridBinarizer(mImage)));
- } catch (ReaderException e) {
- // No logging since every time the reader cannot decode the
- // image, this ReaderException will be thrown.
- } finally {
- mReader.reset();
- }
- if (qrCode != null) {
- if (mScannerCallback.isValid(qrCode.getText())) {
- return qrCode.getText();
- }
- }
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- return null;
- }
- }
- }
-
- @Override
- protected void onPostExecute(String qrCode) {
- if (qrCode != null) {
- mScannerCallback.handleSuccessfulResult(qrCode);
- }
- }
-
- private boolean initCamera(SurfaceTexture surface) {
- final int numberOfCameras = Camera.getNumberOfCameras();
- Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
- try {
- for (int i = 0; i < numberOfCameras; ++i) {
- Camera.getCameraInfo(i, cameraInfo);
- if (cameraInfo.facing == CameraInfo.CAMERA_FACING_BACK) {
- releaseCamera();
- mCamera = Camera.open(i);
- mCameraOrientation = cameraInfo.orientation;
- break;
- }
- }
- if (mCamera == null && numberOfCameras > 0) {
- Log.i(TAG, "Can't find back camera. Opening a different camera");
- Camera.getCameraInfo(0, cameraInfo);
- releaseCamera();
- mCamera = Camera.open(0);
- mCameraOrientation = cameraInfo.orientation;
- }
- } catch (RuntimeException e) {
- Log.e(TAG, "Fail to open camera: " + e);
- mCamera = null;
- mScannerCallback.handleCameraFailure();
- return false;
- }
-
- try {
- if (mCamera == null) {
- throw new IOException("Cannot find available camera");
- }
- mCamera.setPreviewTexture(surface);
- setCameraParameter();
- setTransformationMatrix();
- if (!startPreview()) {
- throw new IOException("Lost contex");
- }
- } catch (IOException ioe) {
- Log.e(TAG, "Fail to startPreview camera: " + ioe);
- mCamera = null;
- mScannerCallback.handleCameraFailure();
- return false;
- }
- return true;
- }
- }
-
- private void releaseCamera() {
- if (mCamera != null) {
- mCamera.release();
- mCamera = null;
- }
- }
-
- /** Set transform matrix to crop and center the preview picture */
- private void setTransformationMatrix() {
- final boolean isPortrait = mContext.get().getResources().getConfiguration().orientation
- == Configuration.ORIENTATION_PORTRAIT;
-
- final int previewWidth = isPortrait ? mPreviewSize.getWidth() : mPreviewSize.getHeight();
- final int previewHeight = isPortrait ? mPreviewSize.getHeight() : mPreviewSize.getWidth();
- final float ratioPreview = (float) getRatio(previewWidth, previewHeight);
-
- // Calculate transformation matrix.
- float scaleX = 1.0f;
- float scaleY = 1.0f;
- if (previewWidth > previewHeight) {
- scaleY = scaleX / ratioPreview;
- } else {
- scaleX = scaleY / ratioPreview;
- }
-
- // Set the transform matrix.
- final Matrix matrix = new Matrix();
- matrix.setScale(scaleX, scaleY);
- mScannerCallback.setTransform(matrix);
- }
-
- private QrYuvLuminanceSource getFrameImage(byte[] imageData) {
- final Rect frame = mScannerCallback.getFramePosition(mPreviewSize, mCameraOrientation);
- final QrYuvLuminanceSource image = new QrYuvLuminanceSource(imageData,
- mPreviewSize.getWidth(), mPreviewSize.getHeight());
- return (QrYuvLuminanceSource)
- image.crop(frame.left, frame.top, frame.width(), frame.height());
- }
-
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MSG_AUTO_FOCUS:
- // Calling autoFocus(null) will only trigger the camera to focus once. In order
- // to make the camera continuously auto focus during scanning, need to periodically
- // trigger it.
- mCamera.autoFocus(/* Camera.AutoFocusCallback */ null);
- sendMessageDelayed(obtainMessage(MSG_AUTO_FOCUS), AUTOFOCUS_INTERVAL_MS);
- break;
- default:
- Log.d(TAG, "Unexpected Message: " + msg.what);
- }
- }
-
- /** Get best preview size from the list of camera supported preview sizes. Compares the
- * preview size and aspect ratio to choose the best one. */
- private Size getBestPreviewSize(Camera.Parameters parameters) {
- final double minRatioDiffPercent = 0.1;
- final Size windowSize = mScannerCallback.getViewSize();
- final double winRatio = getRatio(windowSize.getWidth(), windowSize.getHeight());
- double bestChoiceRatio = 0;
- Size bestChoice = new Size(0, 0);
- for (Camera.Size size : parameters.getSupportedPreviewSizes()) {
- double ratio = getRatio(size.width, size.height);
- if (size.height * size.width > bestChoice.getWidth() * bestChoice.getHeight()
- && (Math.abs(bestChoiceRatio - winRatio) / winRatio > minRatioDiffPercent
- || Math.abs(ratio - winRatio) / winRatio <= minRatioDiffPercent)) {
- bestChoice = new Size(size.width, size.height);
- bestChoiceRatio = getRatio(size.width, size.height);
- }
- }
- return bestChoice;
- }
-
- /** Get best picture size from the list of camera supported picture sizes. Compares the
- * picture size and aspect ratio to choose the best one. */
- private Size getBestPictureSize(Camera.Parameters parameters) {
- final Camera.Size previewSize = parameters.getPreviewSize();
- final double previewRatio = getRatio(previewSize.width, previewSize.height);
- List<Size> bestChoices = new ArrayList<>();
- final List<Size> similarChoices = new ArrayList<>();
-
- // Filter by ratio
- for (Camera.Size size : parameters.getSupportedPictureSizes()) {
- double ratio = getRatio(size.width, size.height);
- if (ratio == previewRatio) {
- bestChoices.add(new Size(size.width, size.height));
- } else if (Math.abs(ratio - previewRatio) < MAX_RATIO_DIFF) {
- similarChoices.add(new Size(size.width, size.height));
- }
- }
-
- if (bestChoices.size() == 0 && similarChoices.size() == 0) {
- Log.d(TAG, "No proper picture size, return default picture size");
- Camera.Size defaultPictureSize = parameters.getPictureSize();
- return new Size(defaultPictureSize.width, defaultPictureSize.height);
- }
-
- if (bestChoices.size() == 0) {
- bestChoices = similarChoices;
- }
-
- // Get the best by area
- int bestAreaDifference = Integer.MAX_VALUE;
- Size bestChoice = null;
- final int previewArea = previewSize.width * previewSize.height;
- for (Size size : bestChoices) {
- int areaDifference = Math.abs(size.getWidth() * size.getHeight() - previewArea);
- if (areaDifference < bestAreaDifference) {
- bestAreaDifference = areaDifference;
- bestChoice = size;
- }
- }
- return bestChoice;
- }
-
- private double getRatio(double x, double y) {
- return (x < y) ? x / y : y / x;
- }
-
- @VisibleForTesting
- protected void decodeImage(BinaryBitmap image) {
- Result qrCode = null;
-
- try {
- qrCode = mReader.decodeWithState(image);
- } catch (ReaderException e) {
- } finally {
- mReader.reset();
- }
-
- if (qrCode != null) {
- mScannerCallback.handleSuccessfulResult(qrCode.getText());
- }
- }
-
- /**
- * After {@link #start(SurfaceTexture)}, DecodingTask runs continuously to capture images and
- * decode QR code. DecodingTask become null After {@link #stop()}.
- *
- * Uses this method in test case to prevent power consumption problem.
- */
- public boolean isDecodeTaskAlive() {
- return mDecodeTask != null;
- }
-}
diff --git a/src/com/android/settings/wifi/qrcode/QrDecorateView.java b/src/com/android/settings/wifi/qrcode/QrDecorateView.java
deleted file mode 100644
index 5df0cd0..0000000
--- a/src/com/android/settings/wifi/qrcode/QrDecorateView.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source 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.
- */
-
-package com.android.settings.wifi.qrcode;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.RectF;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.View;
-
-import com.android.settings.R;
-
-/**
- * Draws the lines at the corner of the inner frame.
- */
-public class QrDecorateView extends View {
- private static final float CORNER_STROKE_WIDTH = 4f; // 4dp
- private static final float CORNER_LINE_LENGTH = 264f; // 264dp
- private static final float CORNER_RADIUS = 16f; // 16dp
-
- final private int mCornerColor;
- final private int mFocusedCornerColor;
- final private int mBackgroundColor;
-
- final private Paint mStrokePaint;
- final private Paint mTransparentPaint;
- final private Paint mBackgroundPaint;
-
- final private float mRadius;
- final private float mInnerRidus;
-
- private Bitmap mMaskBitmap;
- private Canvas mMaskCanvas;
-
- private RectF mOuterFrame;
- private RectF mInnerFrame;
-
- private boolean mFocused;
-
- public QrDecorateView(Context context) {
- this(context, null);
- }
-
- public QrDecorateView(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public QrDecorateView(Context context, AttributeSet attrs, int defStyleAttr) {
- this(context, attrs, defStyleAttr, 0);
- }
-
- public QrDecorateView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
- super(context, attrs, defStyleAttr, defStyleRes);
-
- mFocused = false;
- mRadius = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, CORNER_RADIUS,
- getResources().getDisplayMetrics());
- // Inner radius needs to minus stroke width for keeping the width of border consistent.
- mInnerRidus = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
- CORNER_RADIUS - CORNER_STROKE_WIDTH, getResources().getDisplayMetrics());
-
- mCornerColor = context.getResources().getColor(R.color.qr_corner_line_color);
- mFocusedCornerColor = context.getResources().getColor(R.color.qr_focused_corner_line_color);
- mBackgroundColor = context.getResources().getColor(R.color.qr_background_color);
-
- mStrokePaint = new Paint();
- mStrokePaint.setAntiAlias(true);
-
- mTransparentPaint = new Paint();
- mTransparentPaint.setAntiAlias(true);
- mTransparentPaint.setColor(getResources().getColor(android.R.color.transparent));
- mTransparentPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
-
- mBackgroundPaint = new Paint();
- mBackgroundPaint.setColor(mBackgroundColor);
- }
-
- @Override
- protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- super.onLayout(changed, left, top, right, bottom);
-
- if(mMaskBitmap == null) {
- mMaskBitmap = Bitmap.createBitmap(getWidth(), getHeight(), Bitmap.Config.ARGB_8888);
- mMaskCanvas = new Canvas(mMaskBitmap);
- }
-
- calculateFramePos();
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- // Set frame line color.
- mStrokePaint.setColor(mFocused ? mFocusedCornerColor : mCornerColor);
- // Draw background color.
- mMaskCanvas.drawColor(mBackgroundColor);
- // Draw outer corner.
- mMaskCanvas.drawRoundRect(mOuterFrame, mRadius, mRadius, mStrokePaint);
- // Draw inner transparent corner.
- mMaskCanvas.drawRoundRect(mInnerFrame, mInnerRidus, mInnerRidus, mTransparentPaint);
-
- canvas.drawBitmap(mMaskBitmap, 0, 0, mBackgroundPaint);
- super.onDraw(canvas);
- }
-
- private void calculateFramePos() {
- final int centralX = getWidth() / 2;
- final int centralY = getHeight() / 2;
- final float cornerLineLength = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
- CORNER_LINE_LENGTH, getResources().getDisplayMetrics()) / 2;
- final float strokeWidth = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
- CORNER_STROKE_WIDTH, getResources().getDisplayMetrics());
-
- mOuterFrame = new RectF(centralX - cornerLineLength, centralY - cornerLineLength,
- centralX + cornerLineLength, centralY + cornerLineLength);
- mInnerFrame = new RectF(mOuterFrame.left + strokeWidth, mOuterFrame.top + strokeWidth,
- mOuterFrame.right - strokeWidth, mOuterFrame.bottom - strokeWidth);
- }
-
- // Draws green lines if focused. Otherwise, draws white lines.
- public void setFocused(boolean focused) {
- mFocused = focused;
- invalidate();
- }
-}
diff --git a/src/com/android/settings/wifi/qrcode/QrYuvLuminanceSource.java b/src/com/android/settings/wifi/qrcode/QrYuvLuminanceSource.java
deleted file mode 100644
index 874a758..0000000
--- a/src/com/android/settings/wifi/qrcode/QrYuvLuminanceSource.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source 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
- */
-
-package com.android.settings.wifi.qrcode;
-
-import com.google.zxing.LuminanceSource;
-
-/**
- * This helper class implements crop method to crop preview picture.
- */
-public class QrYuvLuminanceSource extends LuminanceSource {
-
- private byte[] mYuvData;
- private int mWidth;
- private int mHeight;
-
- public QrYuvLuminanceSource(byte[] yuvData, int width, int height) {
- super(width, height);
-
- mWidth = width;
- mHeight = height;
- mYuvData = yuvData;
- }
-
- @Override
- public boolean isCropSupported() {
- return true;
- }
-
- @Override
- public LuminanceSource crop(int left, int top, int crop_width, int crop_height) {
- final byte[] newImage = new byte[crop_width * crop_height];
- int inputOffset = top * mWidth + left;
-
- if (left + crop_width > mWidth || top + crop_height > mHeight) {
- throw new IllegalArgumentException("cropped rectangle does not fit within image data.");
- }
-
- for (int y = 0; y < crop_height; y++) {
- System.arraycopy(mYuvData, inputOffset, newImage, y * crop_width, crop_width);
- inputOffset += mWidth;
- }
- return new QrYuvLuminanceSource(newImage, crop_width, crop_height);
- }
-
- @Override
- public byte[] getRow(int y, byte[] row) {
- if (y < 0 || y >= mHeight) {
- throw new IllegalArgumentException("Requested row is outside the image: " + y);
- }
- if (row == null || row.length < mWidth) {
- row = new byte[mWidth];
- }
- System.arraycopy(mYuvData, y * mWidth, row, 0, mWidth);
- return row;
- }
-
- @Override
- public byte[] getMatrix() {
- return mYuvData;
- }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java b/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java
deleted file mode 100644
index 3ad846d..0000000
--- a/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source 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.
- */
-
-package com.android.settings.wifi.qrcode;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Matrix;
-import android.graphics.Rect;
-import android.graphics.SurfaceTexture;
-import android.hardware.Camera;
-import android.hardware.Camera.Parameters;
-import android.hardware.Camera.Size;
-
-import com.android.settingslib.qrcode.QrCodeGenerator;
-
-import com.google.zxing.BinaryBitmap;
-import com.google.zxing.LuminanceSource;
-import com.google.zxing.RGBLuminanceSource;
-import com.google.zxing.WriterException;
-import com.google.zxing.common.HybridBinarizer;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-@RunWith(RobolectricTestRunner.class)
-public class QrCameraTest {
-
- @Mock
- private SurfaceTexture mSurfaceTexture;
-
- private QrCamera mCamera;
- private Context mContext;
-
- private String mQrCode;
- CountDownLatch mCallbackSignal;
- private boolean mCameraCallbacked;
-
- private class ScannerTestCallback implements QrCamera.ScannerCallback {
- @Override
- public android.util.Size getViewSize() {
- return new android.util.Size(0, 0);
- }
-
- @Override
- public Rect getFramePosition(android.util.Size previewSize, int cameraOrientation) {
- return new Rect(0,0,0,0);
- }
-
- @Override
- public void handleSuccessfulResult(String qrCode) {
- mQrCode = qrCode;
- }
-
- @Override
- public void handleCameraFailure() {
- mCameraCallbacked = true;
- mCallbackSignal.countDown();
- }
-
- @Override
- public void setTransform(Matrix transform) {
- // Do nothing
- }
-
- @Override
- public boolean isValid(String qrCode) {
- return true;
- }
- }
-
- private ScannerTestCallback mScannerCallback;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
- mScannerCallback = new ScannerTestCallback();
- mCamera = new QrCamera(mContext, mScannerCallback);
- mSurfaceTexture = mock(SurfaceTexture.class);
- mQrCode = "";
- mCameraCallbacked = false;
- mCallbackSignal = null;
- }
-
- @Test
- public void testCamera_Init_Callback() throws InterruptedException {
- mCallbackSignal = new CountDownLatch(1);
- mCamera.start(mSurfaceTexture);
- mCallbackSignal.await(5000, TimeUnit.MILLISECONDS);
- assertThat(mCameraCallbacked).isTrue();
- }
-
- @Test
- public void testDecode_PictureCaptured_QrCodeCorrectValue() {
- final String googleUrl = "http://www.google.com";
-
- try {
- final Bitmap bmp = QrCodeGenerator.encodeQrCode(googleUrl, 320);
- final int[] intArray = new int[bmp.getWidth() * bmp.getHeight()];
- bmp.getPixels(intArray, 0, bmp.getWidth(), 0, 0, bmp.getWidth(), bmp.getHeight());
- LuminanceSource source = new RGBLuminanceSource(bmp.getWidth(), bmp.getHeight(),
- intArray);
- final BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
- mCamera.decodeImage(bitmap);
- bmp.recycle();
- } catch (WriterException e) {
- }
-
- assertThat(mQrCode).isEqualTo(googleUrl);
- }
-
- @Test
- public void testDecode_unicodePictureCaptured_QrCodeCorrectValue() {
- final String unicodeTest = "中文測試";
-
- try {
- final Bitmap bmp = QrCodeGenerator.encodeQrCode(unicodeTest, 320);
- final int[] intArray = new int[bmp.getWidth() * bmp.getHeight()];
- bmp.getPixels(intArray, 0, bmp.getWidth(), 0, 0, bmp.getWidth(), bmp.getHeight());
- LuminanceSource source = new RGBLuminanceSource(bmp.getWidth(), bmp.getHeight(),
- intArray);
- final BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
- mCamera.decodeImage(bitmap);
- bmp.recycle();
- } catch (WriterException e) {
- }
-
- assertThat(mQrCode).isEqualTo(unicodeTest);
- }
-
- @Test
- public void setCameraParameter_shouldSetParameters() {
- mCamera.mCamera = mock(Camera.class);
- Parameters parameters = mock(Camera.Parameters.class);
- Size size = mCamera.mCamera.new Size(1920, 1440);
- List<Camera.Size> sizes = new ArrayList<>(Arrays.asList(size));
- when(parameters.getPreviewSize()).thenReturn(size);
- when(parameters.getSupportedPreviewSizes()).thenReturn(sizes);
- when(parameters.getSupportedPictureSizes()).thenReturn(sizes);
- when(mCamera.mCamera.getParameters()).thenReturn(parameters);
-
- mCamera.setCameraParameter();
-
- verify(mCamera.mParameters).setPreviewSize(anyInt(), anyInt());
- verify(mCamera.mParameters).setPictureSize(anyInt(), anyInt());
- verify(mCamera.mCamera).setParameters(mCamera.mParameters);
- }
-}