From a984be6fdb1b672e39687a8c3c062f2f2db6cfc9 Mon Sep 17 00:00:00 2001 From: Oli Lan Date: Fri, 12 Mar 2021 18:25:25 +0000 Subject: [PATCH] Add a setting to turn clipboard access notifications on/off. This adds a new switch setting under Privacy to control whether toast notifications are shown when an app accesses clipboard (see b/179667029 for the clipboard access notification feature). Bug: 179667029 Test: make RunSettingsRoboTests ROBOTEST_FILTER= "com.android.settings.privacy.ShowClipAccessNotificationPreferenceControllerTest" Change-Id: Ibac7f31538ab3e4d2ec476cb8c05cbbd0c7e6d41 --- res/values/strings.xml | 6 ++ res/xml/privacy_dashboard_settings.xml | 7 ++ ...ccessNotificationPreferenceController.java | 54 ++++++++++ ...sNotificationPreferenceControllerTest.java | 102 ++++++++++++++++++ 4 files changed, 169 insertions(+) create mode 100644 src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceControllerTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index 91867dc9e3d..6678d9d4eb2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12874,4 +12874,10 @@ + + + Copy & paste notifications + + + Show a message when apps access text or data you have copied diff --git a/res/xml/privacy_dashboard_settings.xml b/res/xml/privacy_dashboard_settings.xml index f79da612f32..bd6a954c20c 100644 --- a/res/xml/privacy_dashboard_settings.xml +++ b/res/xml/privacy_dashboard_settings.xml @@ -116,4 +116,11 @@ settings:controller="com.android.settings.privacy.EnableContentCaptureWithServiceSettingsPreferenceController"> + + + diff --git a/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java b/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java new file mode 100644 index 00000000000..46224315992 --- /dev/null +++ b/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java @@ -0,0 +1,54 @@ +/* + * 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.privacy; + +import android.content.Context; +import android.provider.Settings; + +import com.android.settings.core.TogglePreferenceController; + +/** + * Controller for preference to toggle whether clipboard access notifications should be shown. + */ +public class ShowClipAccessNotificationPreferenceController extends TogglePreferenceController { + + private static final String KEY_SHOW_CLIP_ACCESS_NOTIFICATION = "show_clip_access_notification"; + + public ShowClipAccessNotificationPreferenceController(Context context) { + super(context, KEY_SHOW_CLIP_ACCESS_NOTIFICATION); + } + + @Override + public boolean isChecked() { + // TODO(b/182349993) Retrieve default value from DeviceConfig. + return Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, 1) != 0; + } + + @Override + public boolean setChecked(boolean isChecked) { + Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, isChecked ? 1 : 0); + return true; + } + + @Override + public int getAvailabilityStatus() { + return AVAILABLE; + } + +} diff --git a/tests/robotests/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceControllerTest.java new file mode 100644 index 00000000000..c707cd600ae --- /dev/null +++ b/tests/robotests/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceControllerTest.java @@ -0,0 +1,102 @@ +/* + * 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.privacy; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.ContentResolver; +import android.content.Context; +import android.provider.Settings; +import android.provider.Settings.SettingNotFoundException; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.test.core.app.ApplicationProvider; + +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; + +@RunWith(RobolectricTestRunner.class) +public class ShowClipAccessNotificationPreferenceControllerTest { + + @Mock + private PreferenceScreen mScreen; + + private Context mContext; + private ShowClipAccessNotificationPreferenceController mController; + private Preference mPreference; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext = ApplicationProvider.getApplicationContext(); + mController = new ShowClipAccessNotificationPreferenceController(mContext); + mPreference = new Preference(mContext); + mPreference.setKey(mController.getPreferenceKey()); + } + + @Test + public void isChecked_settingIsOff_shouldReturnFalse() throws Exception { + setProperty(0); + + assertThat(mController.isChecked()).isFalse(); + } + + @Test + public void isChecked_settingIsOn_shouldReturnTrue() throws Exception { + setProperty(1); + + assertThat(mController.isChecked()).isTrue(); + } + + @Test + public void onPreferenceChange_turnOn_shouldChangeSettingTo1() throws Exception { + setProperty(0); + + mController.onPreferenceChange(mPreference, true); + + assertThat(mController.isChecked()).isTrue(); + assertProperty(1); + } + + @Test + public void onPreferenceChange_turnOff_shouldChangeSettingTo0() throws Exception { + setProperty(1); + + mController.onPreferenceChange(mPreference, false); + + assertThat(mController.isChecked()).isFalse(); + assertProperty(0); + } + + private void setProperty(int newValue) { + final ContentResolver contentResolver = mContext.getContentResolver(); + Settings.Secure.putInt( + contentResolver, Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, newValue); + } + + private void assertProperty(int expectedValue) throws SettingNotFoundException { + final ContentResolver contentResolver = mContext.getContentResolver(); + assertThat(Settings.Secure.getInt( + contentResolver, Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS)) + .isEqualTo(expectedValue); + } +}