From bcfdbf495167e04c50e7aaa35f4d8cd9ed65fe62 Mon Sep 17 00:00:00 2001 From: Steve Elliott Date: Tue, 10 Dec 2019 14:18:53 -0500 Subject: [PATCH] New toggle for peoplehub in Notification settings Fixes: 146150828 Test: manual, atest Change-Id: I7c21b81b1337ca0daf5b846f6ba9c7e6a239f09f --- res/values/strings.xml | 3 + res/xml/configure_notification_settings.xml | 5 + ...cationPeopleStripPreferenceController.java | 117 +++++++++++++++++ ...onPeopleStripPreferenceControllerTest.java | 124 ++++++++++++++++++ 4 files changed, 249 insertions(+) create mode 100644 src/com/android/settings/notification/NotificationPeopleStripPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/notification/NotificationPeopleStripPreferenceControllerTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index d9020e8375c..a03dd53de66 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7909,6 +7909,9 @@ Allow notification dots + + Show strip of recent conversations + Bubbles diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml index fdfde67f846..7dea4e60047 100644 --- a/res/xml/configure_notification_settings.xml +++ b/res/xml/configure_notification_settings.xml @@ -118,6 +118,11 @@ android:summary="@string/summary_placeholder" android:ringtoneType="notification"/> + + 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 new file mode 100644 index 00000000000..786ffb37ae7 --- /dev/null +++ b/tests/robotests/src/com/android/settings/notification/NotificationPeopleStripPreferenceControllerTest.java @@ -0,0 +1,124 @@ +/* + * 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); + } +}