From 8a575029fc2329610ba19986e2f32e24f4752b3e Mon Sep 17 00:00:00 2001 From: Steve Elliott Date: Wed, 5 Feb 2020 14:39:55 -0500 Subject: [PATCH] Disable conversation strip setting. Test: manual, robotests Fixes: 149070144 Fixes: 149001624 Change-Id: I422872e38f7adead81938c39b6084bbc7ed911ae --- res/xml/configure_notification_settings.xml | 5 - ...cationPeopleStripPreferenceController.java | 117 ----------------- ...onPeopleStripPreferenceControllerTest.java | 124 ------------------ 3 files changed, 246 deletions(-) delete mode 100644 src/com/android/settings/notification/NotificationPeopleStripPreferenceController.java delete mode 100644 tests/robotests/src/com/android/settings/notification/NotificationPeopleStripPreferenceControllerTest.java diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml index 4078e824819..3dcddc8eb19 100644 --- a/res/xml/configure_notification_settings.xml +++ b/res/xml/configure_notification_settings.xml @@ -140,11 +140,6 @@ android:ringtoneType="notification" settings:searchable="false"/> - - contentResolver.unregisterContentObserver(observer); - contentResolver.registerContentObserver(mPeopleStripUri, false, observer); - } - - @Override - public void onPause() { - if (mUnregisterOnPropertiesChangedListener != null) { - mUnregisterOnPropertiesChangedListener.run(); - mUnregisterOnPropertiesChangedListener = null; - } - } - - @Override - public int getAvailabilityStatus() { - return AVAILABLE; - } - - @Override - public boolean isSliceable() { - return false; - } - - @Override - public boolean isChecked() { - int value = Settings.Secure.getInt( - mContext.getContentResolver(), - Settings.Secure.PEOPLE_STRIP, - OFF); - return value != OFF; - } - - @Override - public boolean setChecked(boolean isChecked) { - return Settings.Secure.putInt( - mContext.getContentResolver(), - Settings.Secure.PEOPLE_STRIP, - isChecked ? ON : OFF); - } -} diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPeopleStripPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPeopleStripPreferenceControllerTest.java deleted file mode 100644 index 786ffb37ae7..00000000000 --- a/tests/robotests/src/com/android/settings/notification/NotificationPeopleStripPreferenceControllerTest.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (C) 2019 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.notification; - -import static android.provider.Settings.Secure.PEOPLE_STRIP; - -import static com.android.settings.notification.NotificationPeopleStripPreferenceController.OFF; -import static com.android.settings.notification.NotificationPeopleStripPreferenceController.ON; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.content.Context; -import android.provider.Settings; - -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Answers; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.RuntimeEnvironment; - -@RunWith(RobolectricTestRunner.class) -public class NotificationPeopleStripPreferenceControllerTest { - - private static final String KEY_PEOPLE_STRIP = "notification_people_strip"; - - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private Context mContext; - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private PreferenceScreen mScreen; - - private NotificationPeopleStripPreferenceController mController; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - mController = new NotificationPeopleStripPreferenceController(mContext, KEY_PEOPLE_STRIP); - Preference preference = new Preference(RuntimeEnvironment.application); - preference.setKey(mController.getPreferenceKey()); - when(mScreen.findPreference(preference.getKey())).thenReturn(preference); - } - - @Test - public void updateState_preferenceSetCheckedWhenSettingIsOn() { - final TwoStatePreference preference = mock(TwoStatePreference.class); - final Context context = RuntimeEnvironment.application; - Settings.Secure.putInt(context.getContentResolver(), PEOPLE_STRIP, ON); - - mController = new NotificationPeopleStripPreferenceController(context, KEY_PEOPLE_STRIP); - mController.updateState(preference); - - verify(preference).setChecked(true); - } - - @Test - public void updateState_preferenceSetUncheckedWhenSettingIsOff() { - final TwoStatePreference preference = mock(TwoStatePreference.class); - final Context context = RuntimeEnvironment.application; - Settings.Secure.putInt(context.getContentResolver(), PEOPLE_STRIP, OFF); - - mController = new NotificationPeopleStripPreferenceController(context, KEY_PEOPLE_STRIP); - mController.updateState(preference); - - verify(preference).setChecked(false); - } - - @Test - public void isChecked_settingIsOff_shouldReturnFalse() { - Settings.Secure.putInt(mContext.getContentResolver(), PEOPLE_STRIP, OFF); - - assertThat(mController.isChecked()).isFalse(); - } - - @Test - public void isChecked_settingIsOn_shouldReturnTrue() { - Settings.Secure.putInt(mContext.getContentResolver(), PEOPLE_STRIP, ON); - - assertThat(mController.isChecked()).isTrue(); - } - - @Test - public void setChecked_setFalse_disablesSetting() { - Settings.Secure.putInt(mContext.getContentResolver(), PEOPLE_STRIP, ON); - - mController.setChecked(false); - int updatedValue = Settings.Secure.getInt(mContext.getContentResolver(), PEOPLE_STRIP, -1); - - assertThat(updatedValue).isEqualTo(OFF); - } - - @Test - public void setChecked_setTrue_enablesSetting() { - Settings.Secure.putInt(mContext.getContentResolver(), PEOPLE_STRIP, OFF); - - mController.setChecked(true); - int updatedValue = Settings.Secure.getInt(mContext.getContentResolver(), PEOPLE_STRIP, -1); - - assertThat(updatedValue).isEqualTo(ON); - } -}