From 2d0ded469eae42500f920ab739a35170c35f0b5e Mon Sep 17 00:00:00 2001 From: ronish Date: Mon, 18 Oct 2021 11:51:56 +0000 Subject: [PATCH 1/2] Add a new setting for QR Code Scanner button on lockscreen This change adds a new setting to enable/disable the lock screen entry point for QR Code scanner Bug: 200536509 Test: make RunSettingsRoboTests -j40 Change-Id: Id200499b62f59fd631d837f9ae8e494532c23e13 --- res/values/strings.xml | 5 + res/xml/security_lockscreen_settings.xml | 6 + .../QRCodeScannerPreferenceController.java | 108 ++++++++++++++++++ 3 files changed, 119 insertions(+) create mode 100644 src/com/android/settings/display/QRCodeScannerPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml index e9b3fa4ac0f..e69f1bd0958 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -13309,6 +13309,11 @@ Allow access to wallet from lock screen and quick settings + + Show QR Code Scanner + + Allow access to QR code scanner from lock screen + Show device controls diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml index 82cb8609114..5796f2ac553 100644 --- a/res/xml/security_lockscreen_settings.xml +++ b/res/xml/security_lockscreen_settings.xml @@ -51,6 +51,12 @@ android:summary="@string/lockscreen_privacy_wallet_summary" settings:controller="com.android.settings.display.WalletPrivacyPreferenceController" /> + + Date: Mon, 25 Oct 2021 10:48:41 +0000 Subject: [PATCH 2/2] Add tests for QRCodeScannerPreferenceController Bug: 200536509 Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.display.QRCodeScannerPreferenceControllerTest" Change-Id: Ib57a2d12afea93888654362b92b6caeb33823245 --- ...QRCodeScannerPreferenceControllerTest.java | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 tests/robotests/src/com/android/settings/display/QRCodeScannerPreferenceControllerTest.java diff --git a/tests/robotests/src/com/android/settings/display/QRCodeScannerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/QRCodeScannerPreferenceControllerTest.java new file mode 100644 index 00000000000..548d65fb332 --- /dev/null +++ b/tests/robotests/src/com/android/settings/display/QRCodeScannerPreferenceControllerTest.java @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2021 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. + */ + +package com.android.settings.display; + +import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.ContentResolver; +import android.content.Context; +import android.provider.Settings; + +import androidx.preference.Preference; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +@RunWith(RobolectricTestRunner.class) +public class QRCodeScannerPreferenceControllerTest { + private static final String TEST_KEY = "test_key"; + private static final String SETTING_KEY = Settings.Secure.LOCK_SCREEN_SHOW_QR_CODE_SCANNER; + private static final String DEFAULT_COMPONENT = + Settings.Secure.SHOW_QR_CODE_SCANNER_SETTING; + + private Context mContext; + private ContentResolver mContentResolver; + private QRCodeScannerPreferenceController mController; + + @Mock + private Preference mPreference; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mContentResolver = mContext.getContentResolver(); + mController = new QRCodeScannerPreferenceController(mContext, TEST_KEY); + } + + @Test + public void isChecked_SettingIs1_returnTrue() { + Settings.Secure.putInt(mContentResolver, SETTING_KEY, 1); + + assertThat(mController.isChecked()).isTrue(); + } + + @Test + public void isChecked_SettingIs0_returnFalse() { + Settings.Secure.putInt(mContentResolver, SETTING_KEY, 0); + + assertThat(mController.isChecked()).isFalse(); + } + + @Test + public void isChecked_SettingIsNotSet_returnFalse() { + Settings.Secure.putString(mContentResolver, SETTING_KEY, null); + + assertThat(mController.isChecked()).isFalse(); + } + + @Test + public void setChecked_true_SettingIsNot0() { + mController.setChecked(true); + + assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isNotEqualTo(0); + } + + @Test + public void setChecked_false_SettingIs0() { + mController.setChecked(false); + + assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isEqualTo(0); + } + + @Test + public void getAvailabilityStatus_defaultComponentNotSet() { + Settings.Secure.putString(mContext.getContentResolver(), DEFAULT_COMPONENT, null); + assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); + } + + @Test + public void getAvailabilityStatus_defaultComponentSet() { + Settings.Secure.putString(mContext.getContentResolver(), DEFAULT_COMPONENT, "abc"); + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); + } +}