Merge "[LeAudio] New QR code scanner UIs and modify local API" (2d016874) · Commits · e / os / android_frameworks_base

packages/SettingsLib/res/drawable/ic_qr_code_scanner.xml

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2022 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.
		-->

		<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
		android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"
		android:tint="?attr/colorControlNormal">
		<path android:fillColor="@android:color/white"
		android:pathData="M2,7V2H7V4H4V7ZM2,22V17H4V20H7V22ZM17,22V20H20V17H22V22ZM20,7V4H17V2H22V7ZM17.5,17.5H19V19H17.5ZM17.5,14.5H19V16H17.5ZM16,16H17.5V17.5H16ZM14.5,17.5H16V19H14.5ZM13,16H14.5V17.5H13ZM16,13H17.5V14.5H16ZM14.5,14.5H16V16H14.5ZM13,13H14.5V14.5H13ZM19,5V11H13V5ZM11,13V19H5V13ZM11,5V11H5V5ZM9.5,17.5V14.5H6.5V17.5ZM9.5,9.5V6.5H6.5V9.5ZM17.5,9.5V6.5H14.5V9.5Z"/>
		</vector>
		No newline at end of file

packages/SettingsLib/res/layout/qrcode_scan_mode_activity.xml

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2022 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.
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/root"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<LinearLayout
		android:id="@+id/fragment_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"/>

		</LinearLayout>

packages/SettingsLib/res/layout/qrcode_scanner_fragment.xml

0 → 100644

+97 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2022 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.
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="3"
		android:layout_marginBottom="35dp">
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom"
		android:gravity="center"
		android:orientation="vertical">
		<ImageView
		android:src="@drawable/ic_qr_code_scanner"
		android:tint="?androidprv:attr/colorAccentPrimaryVariant"
		android:layout_width="@dimen/qrcode_icon_size"
		android:layout_height="@dimen/qrcode_icon_size"
		android:contentDescription="@null"/>

		<TextView
		style="@style/QrCodeScanner"
		android:textSize="24sp"
		android:text="@string/bt_le_audio_scan_qr_code"
		android:gravity="center"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="19dp"/>

		<TextView
		style="@style/QrCodeScanner"
		android:text="@string/bt_le_audio_scan_qr_code_scanner"
		android:gravity="center"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dp"/>
		</LinearLayout>
		</LinearLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="7"
		android:orientation="vertical">

		<FrameLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="top"
		android:gravity="center"
		android:clipChildren="true">
		<TextureView
		android:id="@+id/preview_view"
		android:layout_marginStart="@dimen/qrcode_preview_margin"
		android:layout_marginEnd="@dimen/qrcode_preview_margin"
		android:layout_width="match_parent"
		android:layout_height="@dimen/qrcode_preview_size"/>
		</FrameLayout>

		<TextView
		android:id="@+id/error_message"
		style="@style/TextAppearance.ErrorText"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="16dp"
		android:layout_marginStart="40dp"
		android:layout_marginEnd="40dp"
		android:gravity="center"
		android:visibility="invisible"/>

		</LinearLayout>


		</LinearLayout>

packages/SettingsLib/res/values/dimens.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -98,4 +98,9 @@
		<!-- Minimum width for the popup for updating a user's photo. -->
		<dimen name="update_user_photo_popup_min_width">300dp</dimen>

		<!-- QR code picture size -->
		<dimen name="qrcode_preview_size">360dp</dimen>
		<dimen name="qrcode_preview_margin">40dp</dimen>
		<dimen name="qrcode_preview_radius">30dp</dimen>
		<dimen name="qrcode_icon_size">27dp</dimen>
		</resources>

packages/SettingsLib/res/values/strings.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -1531,4 +1531,11 @@

		<!-- Content description of the no calling for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_no_calling">No calling.</string>

		<!-- [CHAR LIMIT=NONE] Le audio QR code scanner title -->
		<string name="bt_le_audio_scan_qr_code">Scan QR code</string>
		<!-- [CHAR LIMIT=NONE] Le audio QR code scanner sub-title -->
		<string name="bt_le_audio_scan_qr_code_scanner">To start listening, center the QR code below</string>
		<!-- [CHAR LIMIT=NONE] Hint for QR code process failure -->
		<string name="bt_le_audio_qr_code_is_not_valid_format">QR code isn\u0027t a valid format</string>
		</resources>