Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e300781f authored by Betty Chang's avatar Betty Chang Committed by Automerger Merge Worker
Browse files

Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d34 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794



Change-Id: I9fedeeaf397e15e8c6a9421604a0cf6def4c743c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ab90f46 e5a21d34

src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.app.chooser.DisplayResolveInfo;

import com.android.internal.app.chooser.TargetInfo;

import com.android.settings.R;

import com.android.settings.wifi.qrcode.QrCodeGenerator;

import com.android.settingslib.qrcode.QrCodeGenerator;



import com.google.zxing.WriterException;

src/com/android/settings/wifi/qrcode/QrCodeGenerator.java

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line 
/*

 * 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.graphics.Bitmap;

import android.graphics.Color;



import com.google.zxing.BarcodeFormat;

import com.google.zxing.EncodeHintType;

import com.google.zxing.MultiFormatWriter;

import com.google.zxing.WriterException;

import com.google.zxing.common.BitMatrix;



import java.nio.charset.CharsetEncoder;

import java.nio.charset.StandardCharsets;

import java.util.HashMap;

import java.util.Map;



public final class QrCodeGenerator {

    /**

     * Generates a barcode image with {@code contents}.

     *

     * @param contents The contents to encode in the barcode

     * @param size     The preferred image size in pixels

     * @return Barcode bitmap

     */

    public static Bitmap encodeQrCode(String contents, int size)

            throws WriterException, IllegalArgumentException {

        final Map<EncodeHintType, Object> hints = new HashMap<>();

        if (!isIso88591(contents)) {

            hints.put(EncodeHintType.CHARACTER_SET, StandardCharsets.UTF_8.name());

        }



        final BitMatrix qrBits = new MultiFormatWriter().encode(contents, BarcodeFormat.QR_CODE,

                size, size, hints);

        final Bitmap bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.RGB_565);

        for (int x = 0; x < size; x++) {

            for (int y = 0; y < size; y++) {

                bitmap.setPixel(x, y, qrBits.get(x, y) ? Color.BLACK : Color.WHITE);

            }

        }

        return bitmap;

    }



    private static boolean isIso88591(String contents) {

        CharsetEncoder encoder = StandardCharsets.ISO_8859_1.newEncoder();

        return encoder.canEncode(contents);

    }

}

tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 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;