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

Commit 5f6bf4ae authored by Zoey Chen's avatar Zoey Chen
Browse files

[Le Audio] Move BT QR code scanner from Settingslibs to Settings 

Systemui memory regression, so we have to move the qr code activity back to Settings

Bug: 228031398
Test: manual
Change-Id: I4a528fd3f46955c79533f32601abf338b7e47435
parent c54118d1

packages/SettingsLib/AndroidManifest.xml

+0 −10
Original line number Diff line number Diff line
@@ -22,16 +22,6 @@ 
        <activity

            android:name="com.android.settingslib.users.AvatarPickerActivity"

            android:theme="@style/SudThemeGlifV2.DayNight"/>



        <activity

            android:name="com.android.settingslib.qrcode.QrCodeScanModeActivity"

            android:exported="true">

            <intent-filter>

                <action android:name="android.settings.BLUETOOTH_LE_AUDIO_QR_CODE_SCANNER"/>

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

        </activity>



    </application>



</manifest>

packages/SettingsLib/res/drawable/ic_qr_code_scanner.xml

deleted100644 → 0
+0 −23
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

deleted100644 → 0
+0 −30
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

deleted100644 → 0
+0 −102
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:id="@+id/sud_layout_icon_container"

        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:id="@+id/sud_layout_icon"

                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

                android:id="@+id/sud_layout_title"

                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

                android:id="@+id/sud_layout_subtitle"

                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="?attr/sudMarginStart"

            android:layout_marginEnd="?attr/sudMarginEnd"

            android:gravity="center"

            android:layout_gravity="center"

            android:visibility="invisible"/>



    </LinearLayout>





</LinearLayout>

packages/SettingsLib/res/values/dimens.xml

+0 −6
Original line number Diff line number Diff line
@@ -115,12 +115,6 @@ 
    <!-- Minimum density scale. This is available on all devices. -->

    <fraction name="display_density_min_scale">85%</fraction>



    <!-- 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>



    <!-- Broadcast dialog -->

    <dimen name="broadcast_dialog_title_img_margin_top">18dp</dimen>

    <dimen name="broadcast_dialog_title_text_size">24sp</dimen>