diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index c8ba546584d..7dfb400cc94 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -308,7 +308,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra // background process limit // background check controllers.add(new AppsNotRespondingPreferenceController(context)); - // show notification channel warnings + controllers.add(new NotificationChannelWarningsPreferenceController(context)); // inactive apps controllers.add(new AllowAppsOnExternalPreferenceController(context)); // force activities to be resizable diff --git a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java new file mode 100644 index 00000000000..c0382f2e2e9 --- /dev/null +++ b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2017 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.development; + +import android.content.Context; +import android.os.Build; +import android.provider.Settings; +import android.support.annotation.VisibleForTesting; +import android.support.v14.preference.SwitchPreference; +import android.support.v7.preference.Preference; +import android.support.v7.preference.PreferenceScreen; + +public class NotificationChannelWarningsPreferenceController extends + DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener { + + private static final String SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY = + "show_notification_channel_warnings"; + + private SwitchPreference mPreference; + + @VisibleForTesting + final static int SETTING_VALUE_ON = 1; + @VisibleForTesting + final static int SETTING_VALUE_OFF = 0; + @VisibleForTesting + final static int DEBUGGING_ENABLED = 1; + @VisibleForTesting + final static int DEBUGGING_DISABLED = 0; + + public NotificationChannelWarningsPreferenceController(Context context) { + super(context); + } + + + @Override + public String getPreferenceKey() { + return SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY; + } + + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + + mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey()); + } + + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + final boolean isEnabled = (Boolean) newValue; + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, + isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF); + return true; + } + + @Override + public void updateState(Preference preference) { + final int defaultWarningEnabled = isDebuggable() ? DEBUGGING_ENABLED : DEBUGGING_DISABLED; + final int mode = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, defaultWarningEnabled); + mPreference.setChecked(mode != SETTING_VALUE_OFF); + } + + @Override + protected void onDeveloperOptionsSwitchEnabled() { + mPreference.setEnabled(true); + } + + @Override + protected void onDeveloperOptionsSwitchDisabled() { + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, SETTING_VALUE_OFF); + mPreference.setEnabled(false); + mPreference.setChecked(false); + } + + @VisibleForTesting + boolean isDebuggable() { + return Build.IS_DEBUGGABLE; + } +} diff --git a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java new file mode 100644 index 00000000000..5ad03293b6c --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java @@ -0,0 +1,151 @@ +package com.android.settings.development; + +/* + * Copyright (C) 2017 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. + */ + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.provider.Settings; +import android.support.v14.preference.SwitchPreference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; + + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class NotificationChannelWarningsPreferenceControllerTest { + + @Mock + private SwitchPreference mPreference; + @Mock + private PreferenceScreen mScreen; + + + private Context mContext; + private NotificationChannelWarningsPreferenceController mController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mController = new NotificationChannelWarningsPreferenceController(mContext); + when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); + mController.displayPreference(mScreen); + } + + @Test + public void onPreferenceChange_settingEnabled_shouldEnableNotificationChannelWarnings() { + mController.onPreferenceChange(mPreference, true /* new value */); + + final int mode = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, -1 /* default */); + + assertThat(mode).isEqualTo( + NotificationChannelWarningsPreferenceController.SETTING_VALUE_ON); + } + + @Test + public void onPreferenceChange_settingDisabled_shouldDisableNotificationChannelWarnings() { + mController.onPreferenceChange(mPreference, false /* new value */); + + final int mode = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, -1 /* default */); + + assertThat(mode).isEqualTo( + NotificationChannelWarningsPreferenceController.SETTING_VALUE_OFF); + } + + @Test + public void updateState_settingEnabled_preferenceShouldBeChecked() { + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, + NotificationChannelWarningsPreferenceController.SETTING_VALUE_ON); + + mController.updateState(mPreference); + + verify(mPreference).setChecked(true); + } + + @Test + public void updateState_settingDisabled_preferenceShouldNotBeChecked() { + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, + NotificationChannelWarningsPreferenceController.SETTING_VALUE_OFF); + + mController.updateState(mPreference); + + verify(mPreference).setChecked(false); + } + + @Test + public void updateState_settingUndefinedDebuggingEnabled_preferenceShouldBeChecked() { + mController = spy(mController); + doReturn(true).when(mController).isDebuggable(); + Settings.Global.putString(mContext.getContentResolver(), + Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, "NotAnInteger"); + + mController.updateState(mPreference); + + verify(mPreference).setChecked(true); + } + + @Test + public void updateState_settingUndefinedDebuggingDisabled_preferenceShouldNotBeChecked() { + mController = spy(mController); + doReturn(false).when(mController).isDebuggable(); + Settings.Global.putString(mContext.getContentResolver(), + Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, "NotAnInteger"); + + mController.updateState(mPreference); + + verify(mPreference).setChecked(false); + } + + @Test + public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() { + mController.onDeveloperOptionsSwitchDisabled(); + final int mode = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, -1 /* default */); + + assertThat(mode).isEqualTo( + NotificationChannelWarningsPreferenceController.SETTING_VALUE_OFF); + verify(mPreference).setChecked(false); + verify(mPreference).setEnabled(false); + } + + @Test + public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() { + mController.onDeveloperOptionsSwitchEnabled(); + + verify(mPreference).setEnabled(true); + } +}