Commit Graph

14 Commits

Author SHA1 Message Date
LuK1337
900cc96b86 Merge "Settings: Fix QrCamera crash on devices without flash" am: 68ddb3afdb am: 748ee1657f
am: 9a07055546

Change-Id: Ia93df2d63161923aa0563159f86d6238ea1f27d7
2019-10-30 00:03:03 -07:00
LuK1337
b056ea70f0 Settings: Fix QrCamera crash on devices without flash
Change-Id: Ife34b5fb87a9a4f509b665a3433e0b2ba857c885
2019-10-30 02:45:08 +00:00
Arc Wang
cdfd1ff192 [Wi-Fi] Fix Wi-Fi QR code camera bug
Should not setPreviewSize from the value of getBestPictureSize.

Bug: 142630420
Test: QrCameraTest
      manual:
      visually make sure QR code scanner image not distorted.

Change-Id: I280beddac95ed65118af802c396d15da306e029b
2019-10-28 12:03:38 +08:00
Arc Wang
8eda6847f4 [Wi-Fi] Release the camera before opening
As per the Google's design mentioned at
https://developer.android.com/training/camera/cameradirect.html
Calling Camera.open() throws an exception
if the camera is already in use by another application,
so we wrap it in a try block one must release the camera before opening

Bug: 141662635
Test: Manual occurs once while testing 10 times
1.Open wifi settings,tap QR code icon
2.Make a incoming VoLTE call,tap incoming VoLTE call dialog
3.Check device
Signed-off-by: JeiFeng Lee <linger.lee@mediatek.com>

Change-Id: Ief62600af8b745cb4eae2e5ae277a2cebdda68eb
2019-10-21 15:38:41 +08:00
Arc Wang
a12b372dd2 [Wi-Fi DPP] Refine code
Remove unused code.
Rename some variables and methods for better readability.
Fix typos.
Reduce unnecessary variable scope and method scope.
Simplify some code logic.

Bug: 120645817
Test: atest com.android.settings.wifi.dpp
Change-Id: I8f30b3e445f25ada927e995befee1783d2270b91
2019-07-19 10:29:06 +08:00
Arc Wang
352d866af7 Fix Wi-Fi QR scanner crash problem
1. Should only set picture size from the list of supported picture sizes.
   To choose the best picture size, we should keep ratio as preview size to
   avoid image distortion and QR code scan failure.

2. When Camera#setOneShotPreviewCallback callbacks, the image data is of
   preview size, not picture size.

Bug: 132866467
Test: QrCameraTest
      manual
Change-Id: I087e5fcdf064f111e915e0872b50ca5a45ff1d26
2019-05-24 14:43:06 +08:00
Arc Wang
1d2527061a Fix Wi-Fi QR code scanner height at 360dp
To avoid error message cut on small screen devices

Bug: 131628795
Test: manual
Change-Id: I33fa55da22823064608739bed33cdd287bffa0b8
2019-05-08 11:43:22 +08:00
Arc Wang
e2b4bccbf1 Should not decode Wi-Fi QR code after onPause
Bug: 130141694
Test: manual
      atest WifiDppQrCodeScannerFragmentTest

Change-Id: I412fb7c06220c23bddc7b3c448fcc72a00bdecc3
2019-04-09 13:30:59 +08:00
Fan Zhang
31b210017b Migrate all MetricsProto enums to SettingsEnums
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
2019-01-17 14:55:42 -08:00
Arc Wang
1988fb75c6 Implement Wi-Fi QR code scanner flow.
1. Implements WifiNetworkConfig Wi-Fi connection method
2. Shows error message when the QR code is not valid and hides it after 2s
3. In configurator mode, launchs AddDeviceFragment for a valid QR code
4. In enrollee mode, connects Wi-Fi for a valid QR code

Bug: 118794978
Test: manual test
      atest WifiQrCodetest
      atest WifiDppConfiguratorActivityTest
      atest WifiDppEnrolleeActivityTest
      atest WifiDppQrCodeScannerFragmentTest

Change-Id: Ie4731b22df295c60906156d33ea28dad9c084ce4
2019-01-02 07:12:15 +00:00
Johnson Lu
ebbb0bc563 Adjust camera preview area to square
1.Choose the smaller size of both dimensions as its size.
2.Set transform matrix to crop and center the preview picture.

Bug: 118797380
Test: make RunSettingsRoboTests
Change-Id: Ic65fb1fe0c5082995d6903f50dda48eec16c3fb1
2018-12-15 16:07:02 +08:00
Johnson Lu
a558c01696 Integrate QrCode Camera with WifiDppQrCodeScannerFragment
Bug: 118797380
Test: RunSettingsRoboTests
Change-Id: I328bebbbcf44136df2c18ca1929a5da377a0cf6b
2018-12-01 09:03:39 +08:00
Johnson Lu
b0e66c8807 Refine QrCamera.getBestPreviewSize method
Compares aspect ratio of camera preview and preview window to get better
preview size.

Bug: 118797380
Test: RunSettingsRoboTests
Change-Id: I5c58691b02c2b5d9709ff956e86ca301196d5664
2018-11-21 11:50:36 +08:00
Johnson Lu
881ba4e7ee Add QrCamera for QrCode scanner implementation
The QrCode Scanner is for Wifi DPP feature.

Bug: 118797380
Test: RunSettingsRoboTests
Change-Id: I962d069a8c2bce78c00ac8ce9e8ebf176e75873c
2018-11-09 14:38:01 +08:00