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

Commit 31011d59 authored by Zoey Chen's avatar Zoey Chen Committed by Gerrit Code Review
Browse files

Merge "[LeAudio] Remove the QrCamera and decorateView in Settings"

parents 24f96c2c badca367

res/layout-land/adb_qrcode_scanner_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
                    android:id="@+id/preview_view"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"/>

                <com.android.settings.wifi.qrcode.QrDecorateView

                <com.android.settingslib.qrcode.QrDecorateView

                    android:id="@+id/decorate_view"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"/>

res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
                    android:id="@+id/preview_view"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"/>

                <com.android.settings.wifi.qrcode.QrDecorateView

                <com.android.settingslib.qrcode.QrDecorateView

                    android:id="@+id/decorate_view"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"/>

res/layout/adb_qrcode_scanner_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
                    android:id="@+id/preview_view"

                    android:layout_width="match_parent"

                    android:layout_height="@dimen/qrcode_preview_size"/>

                <com.android.settings.wifi.qrcode.QrDecorateView

                <com.android.settingslib.qrcode.QrDecorateView

                    android:id="@+id/decorate_view"

                    android:layout_width="match_parent"

                    android:layout_height="@dimen/qrcode_preview_size"/>

res/layout/wifi_dpp_qrcode_scanner_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
                    android:id="@+id/preview_view"

                    android:layout_width="match_parent"

                    android:layout_height="@dimen/qrcode_preview_size"/>

                <com.android.settings.wifi.qrcode.QrDecorateView

                <com.android.settingslib.qrcode.QrDecorateView

                    android:id="@+id/decorate_view"

                    android:layout_width="match_parent"

                    android:layout_height="@dimen/qrcode_preview_size"/>

src/com/android/settings/development/AdbQrcodeScannerFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ import com.android.settings.SetupWizardUtils; 
import com.android.settings.wifi.dpp.AdbQrCode;

import com.android.settings.wifi.dpp.WifiDppQrCodeBaseFragment;

import com.android.settings.wifi.dpp.WifiNetworkConfig;

import com.android.settings.wifi.qrcode.QrCamera;

import com.android.settings.wifi.qrcode.QrDecorateView;

import com.android.settingslib.qrcode.QrCamera;

import com.android.settingslib.qrcode.QrDecorateView;



import com.google.android.setupdesign.util.ThemeHelper;