Merge branch '346-full-screen-qr-code' into 'master'

Add fullscreen button to QR code view

Closes #346

See merge request akwizgran/briar!734
This commit is contained in:
akwizgran
2018-03-26 15:30:30 +00:00
6 changed files with 134 additions and 62 deletions

View File

@@ -414,5 +414,7 @@
<string name="permission_camera_request_body">To scan the QR code, Briar needs access to the camera.</string>
<string name="permission_camera_denied_body">You have denied access to the camera, but adding contacts requires using the camera.\n\nPlease consider granting access.</string>
<string name="permission_camera_denied_toast">Camera permission was not granted</string>
<string name="qr_code">QR code</string>
<string name="show_qr_code_fullscreen">Show QR code fullscreen</string>
</resources>