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

Commit 0b30679a authored by Ronish Kalia's avatar Ronish Kalia Committed by Android (Google) Code Review
Browse files

Merge changes from topic "qr-code-and" 

* changes:
  Add tests for QRCodeScannerPreferenceController
  Add a new setting for QR Code Scanner button on lockscreen
parents 07c41906 870ae982

res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -13328,6 +13328,11 @@ 
    <!-- Wallet (formerly Cards and passes) summary [CHAR LIMIT=NONE] -->

    <string name="lockscreen_privacy_wallet_summary">Allow access to wallet from lock screen and quick settings</string>









    <!-- QR Code Scanner toggle name [CHAR LIMIT=60] -->









    <string name="lockscreen_privacy_qr_code_scanner_setting_toggle">Show QR Code Scanner</string>









    <!-- QR Code Scanner summary [CHAR LIMIT=NONE] -->









    <string name="lockscreen_privacy_qr_code_scanner_summary">Allow access to QR code scanner from lock screen</string>

















    <!-- Device controls toggle name [CHAR LIMIT=60] -->









    <string name="lockscreen_privacy_controls_setting_toggle">Show device controls</string>









    <!-- Device controls summary [CHAR LIMIT=NONE] -->

























res/xml/security_lockscreen_settings.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -51,6 +51,12 @@







            android:summary="@string/lockscreen_privacy_wallet_summary"









            settings:controller="com.android.settings.display.WalletPrivacyPreferenceController" />



















        <SwitchPreference









            android:key="lock_screen_show_qr_scanner"









            android:title="@string/lockscreen_privacy_qr_code_scanner_setting_toggle"









            android:summary="@string/lockscreen_privacy_qr_code_scanner_summary"









            settings:controller="com.android.settings.display.QRCodeScannerPreferenceController" />



















        <SwitchPreference









            android:key="lockscreen_privacy_controls_switch"









            android:title="@string/lockscreen_privacy_controls_setting_toggle"
































src/com/android/settings/display/QRCodeScannerPreferenceController.java
0 → 100644



+108
−0






























Original line number
Diff line number
Diff line









/*









 * 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 android.provider.Settings.Secure.SHOW_QR_CODE_SCANNER_SETTING;



















import static androidx.lifecycle.Lifecycle.Event.ON_START;









import static androidx.lifecycle.Lifecycle.Event.ON_STOP;



















import android.content.ContentResolver;









import android.content.Context;









import android.database.ContentObserver;









import android.net.Uri;









import android.provider.Settings;



















import androidx.lifecycle.OnLifecycleEvent;









import androidx.preference.Preference;









import androidx.preference.PreferenceScreen;



















import com.android.settings.R;









import com.android.settings.core.TogglePreferenceController;



















/**









 * Preference controller for enabling/disabling QR code scanner button on lock screen.









 */









public class QRCodeScannerPreferenceController extends TogglePreferenceController {









    private static final String SETTING_KEY = Settings.Secure.LOCK_SCREEN_SHOW_QR_CODE_SCANNER;









    private final ContentObserver mSettingsObserver;









    private final ContentResolver mContentResolver;









    private Preference mPreference;



















    public QRCodeScannerPreferenceController(Context context, String preferenceKey) {









        super(context, preferenceKey);









        mContentResolver = context.getContentResolver();









        mSettingsObserver = new ContentObserver(null) {









            @Override









            public void onChange(boolean selfChange, Uri uri) {









                updateState(mPreference);









            }









        };









    }



















    @Override









    public void displayPreference(PreferenceScreen screen) {









        super.displayPreference(screen);









        mPreference = screen.findPreference(getPreferenceKey());









    }



















    /** Called when activity starts being displayed to user. */









    @OnLifecycleEvent(ON_START)









    public void onStart() {









        mContentResolver.registerContentObserver(









                Settings.Global.getUriFor(SHOW_QR_CODE_SCANNER_SETTING), false,









                mSettingsObserver);









    }



















    /** Called when activity stops being displayed to user. */









    @OnLifecycleEvent(ON_STOP)









    public void onStop() {









        mContentResolver.unregisterContentObserver(mSettingsObserver);









    }



















    @Override









    public boolean isChecked() {









        return Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 0) != 0;









    }



















    @Override









    public boolean setChecked(boolean isChecked) {









        return Settings.Secure.putInt(mContext.getContentResolver(), SETTING_KEY,









                isChecked ? 1 : 0);









    }



















    @Override









    public int getAvailabilityStatus() {









        return isScannerActivityAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;









    }



















    @Override









    public void updateState(Preference preference) {









        super.updateState(preference);









        refreshSummary(preference);









    }



















    @Override









    public int getSliceHighlightMenuRes() {









        return R.string.menu_key_display;









    }



















    private boolean isScannerActivityAvailable() {









        return Settings.Secure.getString(mContext.getContentResolver(),









                SHOW_QR_CODE_SCANNER_SETTING) != null;









    }









}
























tests/robotests/src/com/android/settings/display/QRCodeScannerPreferenceControllerTest.java
0 → 100644



+106
−0






























Original line number
Diff line number
Diff line









/*









 * 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);









    }









}