From 5f6bf4aeded6422d361010ba0a61111cf0d9c3b7 Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Thu, 12 May 2022 11:52:25 +0800 Subject: [PATCH] [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 --- packages/SettingsLib/AndroidManifest.xml | 10 - .../res/drawable/ic_qr_code_scanner.xml | 23 -- .../res/layout/qrcode_scan_mode_activity.xml | 30 --- .../res/layout/qrcode_scanner_fragment.xml | 102 -------- packages/SettingsLib/res/values/dimens.xml | 6 - packages/SettingsLib/res/values/strings.xml | 7 - packages/SettingsLib/res/values/styles.xml | 7 - .../qrcode/QrCodeScanModeActivity.java | 109 -------- .../qrcode/QrCodeScanModeBaseActivity.java | 46 ---- .../qrcode/QrCodeScanModeController.java | 82 ------ .../qrcode/QrCodeScanModeFragment.java | 235 ------------------ 11 files changed, 657 deletions(-) delete mode 100644 packages/SettingsLib/res/drawable/ic_qr_code_scanner.xml delete mode 100644 packages/SettingsLib/res/layout/qrcode_scan_mode_activity.xml delete mode 100644 packages/SettingsLib/res/layout/qrcode_scanner_fragment.xml delete mode 100644 packages/SettingsLib/src/com/android/settingslib/qrcode/QrCodeScanModeActivity.java delete mode 100644 packages/SettingsLib/src/com/android/settingslib/qrcode/QrCodeScanModeBaseActivity.java delete mode 100644 packages/SettingsLib/src/com/android/settingslib/qrcode/QrCodeScanModeController.java delete mode 100644 packages/SettingsLib/src/com/android/settingslib/qrcode/QrCodeScanModeFragment.java diff --git a/packages/SettingsLib/AndroidManifest.xml b/packages/SettingsLib/AndroidManifest.xml index 3e67abfe19603..13f8a372c9b57 100644 --- a/packages/SettingsLib/AndroidManifest.xml +++ b/packages/SettingsLib/AndroidManifest.xml @@ -22,16 +22,6 @@ - - - - - - - - diff --git a/packages/SettingsLib/res/drawable/ic_qr_code_scanner.xml b/packages/SettingsLib/res/drawable/ic_qr_code_scanner.xml deleted file mode 100644 index f6f63c5ae7fa9..0000000000000 --- a/packages/SettingsLib/res/drawable/ic_qr_code_scanner.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packages/SettingsLib/res/layout/qrcode_scan_mode_activity.xml b/packages/SettingsLib/res/layout/qrcode_scan_mode_activity.xml deleted file mode 100644 index f0a182b3d67b2..0000000000000 --- a/packages/SettingsLib/res/layout/qrcode_scan_mode_activity.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - diff --git a/packages/SettingsLib/res/layout/qrcode_scanner_fragment.xml b/packages/SettingsLib/res/layout/qrcode_scanner_fragment.xml deleted file mode 100644 index 0a7fe09033488..0000000000000 --- a/packages/SettingsLib/res/layout/qrcode_scanner_fragment.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/SettingsLib/res/values/dimens.xml b/packages/SettingsLib/res/values/dimens.xml index cbc79d2d5d930..226b119ebb767 100644 --- a/packages/SettingsLib/res/values/dimens.xml +++ b/packages/SettingsLib/res/values/dimens.xml @@ -115,12 +115,6 @@ 85% - - 360dp - 40dp - 30dp - 27dp - 18dp 24sp diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index a171f86dd2176..847f1dc541e8e 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1589,13 +1589,6 @@ Allow an app to turn the screen on. If granted, the app may turn on the screen at any time without your explicit intent. - - Scan QR code - - To start listening, center the QR code below - - QR code isn\u0027t a valid format - Stop broadcasting %1$s? diff --git a/packages/SettingsLib/res/values/styles.xml b/packages/SettingsLib/res/values/styles.xml index 32345150531dc..5237b4fa1c3d6 100644 --- a/packages/SettingsLib/res/values/styles.xml +++ b/packages/SettingsLib/res/values/styles.xml @@ -33,13 +33,6 @@ ?android:attr/colorError - -