PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add setting to hide silent notifs in status bar"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-29 18:35:16 +00:00
committed by Android (Google) Code Review
parent 610a2c3fe4 86c0007e1d
commit ecb62abbc5
6 changed files with 148 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -8080,6 +8080,9 @@
<!-- Gentle notifications settings: display on all surfaces [CHAR LIMIT=100] --> <!-- Gentle notifications settings: display on all surfaces [CHAR LIMIT=100] -->
<string name="gentle_notifications_display_summary_shade_status_lock">Display in pull-down shade, status bar &amp; on lock screen</string> <string name="gentle_notifications_display_summary_shade_status_lock">Display in pull-down shade, status bar &amp; on lock screen</string>
<!-- Notification settings: suppress status bar/ambient icons for silent notifications -->
<string name="silent_notifications_status_bar">Hide silent notifications in status bar</string>
<!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] --> <!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->
<string name="notification_pulse_title">Blink light</string> <string name="notification_pulse_title">Blink light</string>

5
res/xml/configure_notification_settings.xml
View File

@@ -87,6 +87,11 @@
android:order="15" android:order="15"
settings:initialExpandedChildrenCount="0"> settings:initialExpandedChildrenCount="0">
<SwitchPreference
android:key="silent_icons"
android:title="@string/silent_notifications_status_bar"
settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
<SwitchPreference <SwitchPreference
android:key="show_snooze_options" android:key="show_snooze_options"
android:title="@string/snooze_options_title" android:title="@string/snooze_options_title"

76
src/com/android/settings/notification/GentleNotificationsPreferenceController.java
View File

@@ -1,76 +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 android.content.Context;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import androidx.annotation.VisibleForTesting;
public class GentleNotificationsPreferenceController extends BasePreferenceController {
@VisibleForTesting
static final int ON = 1;
private NotificationBackend mBackend;
public GentleNotificationsPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mBackend = new NotificationBackend();
}
@VisibleForTesting
void setBackend(NotificationBackend backend) {
mBackend = backend;
}
@Override
public CharSequence getSummary() {
boolean showOnLockscreen = showOnLockscreen();
boolean showOnStatusBar = showOnStatusBar();
if (showOnLockscreen) {
if (showOnStatusBar) {
return mContext.getString(
R.string.gentle_notifications_display_summary_shade_status_lock);
} else {
return mContext.getString(R.string.gentle_notifications_display_summary_shade_lock);
}
} else if (showOnStatusBar) {
return mContext.getString(R.string.gentle_notifications_display_summary_shade_status);
} else {
return mContext.getString(R.string.gentle_notifications_display_summary_shade);
}
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
}
private boolean showOnLockscreen() {
return Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, ON) == ON;
}
private boolean showOnStatusBar() {
return !mBackend.shouldHideSilentStatusBarIcons(mContext);
}
}

55
src/com/android/settings/notification/SilentStatusBarPreferenceController.java Normal file
View File

@@ -0,0 +1,55 @@
/*
* Copyright (C) 2020 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 android.content.Context;
import com.android.settings.core.TogglePreferenceController;
import com.google.common.annotations.VisibleForTesting;
public class SilentStatusBarPreferenceController extends TogglePreferenceController {
private static final String KEY = "silent_icons";
private NotificationBackend mBackend;
public SilentStatusBarPreferenceController(Context context) {
super(context, KEY);
mBackend = new NotificationBackend();
}
@VisibleForTesting
void setBackend(NotificationBackend backend) {
mBackend = backend;
}
@Override
public boolean isChecked() {
return mBackend.shouldHideSilentStatusBarIcons(mContext);
}
@Override
public boolean setChecked(boolean isChecked) {
mBackend.setHideSilentStatusIcons(isChecked);
return true;
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
}
}

107
tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java
View File

@@ -1,107 +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 com.android.settings.notification.BadgingNotificationPreferenceController.OFF;
import static com.android.settings.notification.BadgingNotificationPreferenceController.ON;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
import com.android.settings.R;
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;
import androidx.preference.Preference;
@RunWith(RobolectricTestRunner.class)
public class GentleNotificationsPreferenceControllerTest {
private Context mContext;
@Mock
NotificationBackend mBackend;
private GentleNotificationsPreferenceController mController;
private Preference mPreference;
private static final String KEY = "gentle_notifications";
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new GentleNotificationsPreferenceController(mContext, KEY);
mController.setBackend(mBackend);
mPreference = new Preference(mContext);
}
@Test
public void display_shouldDisplay() {
assertThat(mPreference.isVisible()).isTrue();
}
@Test
public void getSummary_lock() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1);
when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(true);
assertThat(mController.getSummary()).isEqualTo(
mContext.getString(R.string.gentle_notifications_display_summary_shade_lock));
}
@Test
public void getSummary_status() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0);
when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(false);
assertThat(mController.getSummary()).isEqualTo(
mContext.getString(R.string.gentle_notifications_display_summary_shade_status));
}
@Test
public void getSummary_both() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1);
when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(false);
assertThat(mController.getSummary()).isEqualTo(mContext.getString(
R.string.gentle_notifications_display_summary_shade_status_lock));
}
@Test
public void getSummary_neither() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0);
when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(true);
assertThat(mController.getSummary()).isEqualTo(
mContext.getString(R.string.gentle_notifications_display_summary_shade));
}
}

85
tests/robotests/src/com/android/settings/notification/SilentStatusBarPreferenceControllerTest.java Normal file
View File

@@ -0,0 +1,85 @@
/*
* Copyright (C) 2020 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 com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
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 SilentStatusBarPreferenceControllerTest {
@Mock
private NotificationBackend mBackend;
@Mock
private PreferenceScreen mScreen;
private Context mContext;
private SilentStatusBarPreferenceController mController;
private Preference mPreference;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new SilentStatusBarPreferenceController(mContext);
mController.setBackend(mBackend);
mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey());
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@Test
public void isChecked_settingIsOff() {
when(mBackend.shouldHideSilentStatusBarIcons(any())).thenReturn(false);
assertThat(mController.isChecked()).isFalse();
}
@Test
public void isChecked_settingIsOn() {
when(mBackend.shouldHideSilentStatusBarIcons(any())).thenReturn(true);
assertThat(mController.isChecked()).isTrue();
}
@Test
public void setChecked_Off() {
mController.setChecked(false);
verify(mBackend, times(1)).setHideSilentStatusIcons(false);
}
@Test
public void setChecked_On() {
mController.setChecked(true);
verify(mBackend, times(1)).setHideSilentStatusIcons(true);
}
}