diff options
5 files changed, 15 insertions, 32 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 689ff66a3b4d..21abd2237bfa 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -5662,6 +5662,9 @@ <!-- Whether or not to enable the lock screen entry point for the QR code scanner. --> <bool name="config_enableQrCodeScannerOnLockScreen">false</bool> + <!-- Default component for QR code scanner --> + <string name="config_defaultQrCodeComponent"></string> + <!-- Whether Low Power Standby is supported and can be enabled. --> <bool name="config_lowPowerStandbySupported">false</bool> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 443f9a628a7e..678dd9ffa665 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4708,6 +4708,7 @@ <java-symbol type="string" name="config_wearSysUiPackage"/> <java-symbol type="string" name="config_wearSysUiMainActivity"/> + <java-symbol type="string" name="config_defaultQrCodeComponent"/> <java-symbol type="dimen" name="secondary_rounded_corner_radius" /> <java-symbol type="dimen" name="secondary_rounded_corner_radius_top" /> diff --git a/packages/SystemUI/res/values/defaults.xml b/packages/SystemUI/res/values/defaults.xml deleted file mode 100644 index f96c178b119a..000000000000 --- a/packages/SystemUI/res/values/defaults.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/** - * Copyright (c) 2009, 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. - */ ---> -<resources> - <!-- Default for SystemUiDeviceConfigFlags.DEFAULT_QR_CODE_SCANNER. - To be set if the device wants to support out of the box QR code scanning experience --> - <string name="def_qr_code_component" translatable="false"></string> -</resources> diff --git a/packages/SystemUI/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerController.java b/packages/SystemUI/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerController.java index 8000bdccfa68..2c20feb19342 100644 --- a/packages/SystemUI/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerController.java +++ b/packages/SystemUI/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerController.java @@ -29,7 +29,6 @@ import android.provider.Settings; import android.util.Log; import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; -import com.android.systemui.R; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.settings.UserTracker; @@ -119,7 +118,6 @@ public class QRCodeScannerController implements mSecureSettings = secureSettings; mDeviceConfigProxy = proxy; mUserTracker = userTracker; - mConfigEnableLockScreenButton = mContext.getResources().getBoolean( android.R.bool.config_enableQrCodeScannerOnLockScreen); } @@ -258,16 +256,20 @@ public class QRCodeScannerController implements } } + private String getDefaultScannerActivity() { + return mContext.getResources().getString( + com.android.internal.R.string.config_defaultQrCodeComponent); + } + private void updateQRCodeScannerActivityDetails() { String qrCodeScannerActivity = mDeviceConfigProxy.getString( DeviceConfig.NAMESPACE_SYSTEMUI, SystemUiDeviceConfigFlags.DEFAULT_QR_CODE_SCANNER, ""); // "" means either the flags is not available or is set to "", and in both the cases we - // want to use R.string.def_qr_code_component + // want to use R.string.config_defaultQrCodeComponent if (Objects.equals(qrCodeScannerActivity, "")) { - qrCodeScannerActivity = - mContext.getResources().getString(R.string.def_qr_code_component); + qrCodeScannerActivity = getDefaultScannerActivity(); } String prevQrCodeScannerActivity = mQRCodeScannerActivity; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerControllerTest.java index 4a6bbbcf1d6b..346d1e60fcf9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerControllerTest.java @@ -24,7 +24,6 @@ import static com.android.systemui.qrcodescanner.controller.QRCodeScannerControl import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -32,6 +31,7 @@ import static org.mockito.Mockito.when; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.content.res.Resources; import android.os.UserHandle; import android.provider.DeviceConfig; import android.provider.Settings; @@ -41,7 +41,6 @@ import android.testing.TestableLooper; import androidx.test.filters.SmallTest; import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; -import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.settings.UserTracker; import com.android.systemui.util.DeviceConfigProxyFake; @@ -90,8 +89,9 @@ public class QRCodeScannerControllerTest extends SysuiTestCase { when(mPackageManager.queryIntentActivities(any(Intent.class), any(Integer.class))).thenReturn(resolveInfoList); when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)).thenReturn(true); - mContext.getOrCreateTestableResources().addOverride(R.string.def_qr_code_component, - defaultActivity); + mContext.getOrCreateTestableResources().addOverride( + com.android.internal.R.string.config_defaultQrCodeComponent, defaultActivity); + mContext.getOrCreateTestableResources().addOverride( android.R.bool.config_enableQrCodeScannerOnLockScreen, enableOnLockScreen); |