Fix Wi-Fi Easy Connect QR code scanner problems

1. When camera area overlaps display cutout, it's onLayout size is 0/0.
   To fix it, use ConstraintLayout to specify width and height in layout file.

2. When scanned a QR code and there is an error, set camera area frame line
   back to unfocused color.

Bug: 124399763
Test: manual test
Change-Id: I7575efd0ccfb58d114acc3dcca6978d68b801f91
This commit is contained in:
Arc Wang
2019-03-26 16:07:02 +08:00
parent c74577eacf
commit 8ae9717226
4 changed files with 12 additions and 57 deletions

View File

@@ -1,49 +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.util.AttributeSet;
import android.widget.FrameLayout;
/**
* A customize square {@link FrameLayout}.
* This is used for camera preview. Choose the smaller size of both dimensions as length and width.
*/
public class QrPreviewLayout extends FrameLayout {
public QrPreviewLayout(Context context) {
super(context);
}
public QrPreviewLayout(Context context, AttributeSet attrs) {
super(context, attrs);
}
public QrPreviewLayout(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
// Choose the smaller size of the two dimensions.
if (MeasureSpec.getSize(widthMeasureSpec) > MeasureSpec.getSize(heightMeasureSpec)) {
super.onMeasure(heightMeasureSpec, heightMeasureSpec);
} else {
super.onMeasure(widthMeasureSpec, widthMeasureSpec);
}
}
}