Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f43cf086 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Update configure notifications screen 

Test: atest
Bug: 153150072
Change-Id: I99ebe2cad5036a154c40bce54dbd6ddbd23c2323
parent 87883c76

res/xml/configure_notification_settings.xml

+32 −30
Original line number Diff line number Diff line
@@ -25,16 +25,41 @@ 
        settings:controller="com.android.settings.widget.VideoPreferenceController"

        android:persistent="false" />



    <!-- Empty category to draw divider -->

    <PreferenceCategory

        android:key="all_notifications_divider"

        android:order="2"/>

    <Preference

        android:key="notification_history"

        android:title="@string/notification_history"

        android:summary="@string/notification_history_summary"

        settings:allowDividerAbove="true"

        settings:allowDividerBelow="false"

        android:order="2">

        <intent

            android:action="android.intent.action.MAIN"

            android:targetPackage="com.android.settings"

            android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />

    </Preference>



    <Preference

        android:key="conversations"

        android:title="@string/conversations_category_title"

        android:summary="@string/manage_conversations"

        android:order="3"

        android:fragment="com.android.settings.notification.app.ConversationListSettings"

    />



    <Preference

        android:key="notification_bubbles"

        android:title="@string/notification_bubbles_title"

        android:summary="@string/notifications_bubble_setting_on_summary"

        android:order="4"

        settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"

        android:fragment="com.android.settings.notification.BubbleNotificationSettings"

    />



    <PreferenceCategory

        android:key="recent_notifications_category"

        android:title="@string/recent_notifications"

        settings:allowDividerAbove="false"

        android:order="3">

        settings:allowDividerAbove="true"

        android:order="5">

        <!-- Placeholder for a list of recent apps -->



        <!-- See all apps button -->
@@ -42,7 +67,7 @@ 
            android:key="all_notifications"

            android:title="@string/notifications_title"

            android:fragment="com.android.settings.applications.manageapplications.ManageApplications"

            android:order="4"

            android:order="6"

            settings:searchable="false">

            <extra

                android:name="classname"
@@ -50,23 +75,6 @@ 
        </Preference>

    </PreferenceCategory>



    <Preference

        android:key="conversations"

        android:title="@string/conversations_category_title"

        settings:allowDividerAbove="true"

        android:summary="@string/manage_conversations"

        android:order="6"

        android:fragment="com.android.settings.notification.app.ConversationListSettings"

        />



    <Preference

        android:key="notification_bubbles"

        android:title="@string/notification_bubbles_title"

        android:summary="@string/notifications_bubble_setting_on_summary"

        android:order="7"

        settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"

        android:fragment="com.android.settings.notification.BubbleNotificationSettings"

        />



    <PreferenceCategory

        android:key="configure_notifications_lock"
@@ -105,12 +113,6 @@ 
        android:order="15"

        settings:initialExpandedChildrenCount="0">



        <SwitchPreference

            android:key="notification_history"

            android:title="@string/notification_history"

            android:summary="@string/notification_history_summary"

            settings:controller="com.android.settings.notification.NotificationHistoryPreferenceController"/>



        <SwitchPreference

            android:key="silent_icons"

            android:title="@string/silent_notifications_status_bar"

src/com/android/settings/notification/NotificationHistoryPreferenceController.java

deleted100644 → 0
+0 −128
Original line number Diff line number Diff line 
/*

 * 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 android.provider.Settings.Secure.NOTIFICATION_HISTORY_ENABLED;



import android.content.ContentResolver;

import android.content.Context;

import android.database.ContentObserver;

import android.net.Uri;

import android.os.Handler;

import android.provider.Settings;

import android.text.TextUtils;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnPause;

import com.android.settingslib.core.lifecycle.events.OnResume;



public class NotificationHistoryPreferenceController extends TogglePreferenceController

        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,

        LifecycleObserver, OnResume, OnPause {



    private static final String TAG = "NotifHistoryPrefContr";

    @VisibleForTesting

    static final int ON = 1;

    @VisibleForTesting

    static final int OFF = 0;



    private SettingObserver mSettingObserver;



    public NotificationHistoryPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        Preference preference = screen.findPreference(NOTIFICATION_HISTORY_ENABLED);

        if (preference != null) {

            mSettingObserver = new SettingObserver(preference);

        }

    }



    @Override

    public void onResume() {

        if (mSettingObserver != null) {

            mSettingObserver.register(mContext.getContentResolver(), true /* register */);

        }

    }



    @Override

    public void onPause() {

        if (mSettingObserver != null) {

            mSettingObserver.register(mContext.getContentResolver(), false /* register */);

        }

    }



    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

    }



    @Override

    public boolean isSliceable() {

        return false;

    }



    @Override

    public boolean isChecked() {

        return Settings.Secure.getInt(mContext.getContentResolver(),

                NOTIFICATION_HISTORY_ENABLED, ON) == ON;

    }



    @Override

    public boolean setChecked(boolean isChecked) {

        return Settings.Secure.putInt(mContext.getContentResolver(),

                NOTIFICATION_HISTORY_ENABLED, isChecked ? ON : OFF);

    }



    class SettingObserver extends ContentObserver {



        private final Uri NOTIFICATION_URI =

                Settings.Secure.getUriFor(NOTIFICATION_HISTORY_ENABLED);



        private final Preference mPreference;



        public SettingObserver(Preference preference) {

            super(new Handler());

            mPreference = preference;

        }



        public void register(ContentResolver cr, boolean register) {

            if (register) {

                cr.registerContentObserver(NOTIFICATION_URI, false, this);

            } else {

                cr.unregisterContentObserver(this);

            }

        }



        @Override

        public void onChange(boolean selfChange, Uri uri) {

            super.onChange(selfChange, uri);

            if (NOTIFICATION_URI.equals(uri)) {

                updateState(mPreference);

            }

        }

    }

}

src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java

+1 −7
Original line number Diff line number Diff line
@@ -66,8 +66,7 @@ public class RecentNotifyingAppsPreferenceController extends AbstractPreferenceC 


    private static final String TAG = "RecentNotisCtrl";

    private static final String KEY_PREF_CATEGORY = "recent_notifications_category";

    @VisibleForTesting

    static final String KEY_DIVIDER = "all_notifications_divider";



    @VisibleForTesting

    static final String KEY_SEE_ALL = "all_notifications";

    private static final int SHOW_RECENT_APP_COUNT = 3;
@@ -86,7 +85,6 @@ public class RecentNotifyingAppsPreferenceController extends AbstractPreferenceC 


    private PreferenceCategory mCategory;

    private Preference mSeeAllPref;

    private Preference mDivider;

    protected List<Integer> mUserIds;



    public RecentNotifyingAppsPreferenceController(Context context, NotificationBackend backend,
@@ -130,14 +128,12 @@ public class RecentNotifyingAppsPreferenceController extends AbstractPreferenceC 
        PreferenceControllerMixin.super.updateNonIndexableKeys(keys);

        // Don't index category name into search. It's not actionable.

        keys.add(KEY_PREF_CATEGORY);

        keys.add(KEY_DIVIDER);

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        mCategory = screen.findPreference(getPreferenceKey());

        mSeeAllPref = screen.findPreference(KEY_SEE_ALL);

        mDivider = screen.findPreference(KEY_DIVIDER);

        super.displayPreference(screen);

        refreshUi(mCategory.getContext());

    }
@@ -208,7 +204,6 @@ public class RecentNotifyingAppsPreferenceController extends AbstractPreferenceC 


    private void displayOnlyAllAppsLink() {

        mCategory.setTitle(null);

        mDivider.setVisible(false);

        mSeeAllPref.setTitle(R.string.notifications_title);

        mSeeAllPref.setIcon(null);

        int prefCount = mCategory.getPreferenceCount();
@@ -222,7 +217,6 @@ public class RecentNotifyingAppsPreferenceController extends AbstractPreferenceC 


    private void displayRecentApps(Context prefContext, List<NotifyingApp> recentApps) {

        mCategory.setTitle(R.string.recent_notifications);

        mDivider.setVisible(true);

        mSeeAllPref.setSummary(null);

        mSeeAllPref.setIcon(R.drawable.ic_chevron_right_24dp);

tests/robotests/src/com/android/settings/notification/NotificationHistoryPreferenceControllerTest.java

deleted100644 → 0
+0 −139
Original line number Diff line number Diff line 
/*

 * 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 android.provider.Settings.Secure.NOTIFICATION_HISTORY_ENABLED;



import static com.android.settings.notification.NotificationHistoryPreferenceController.OFF;

import static com.android.settings.notification.NotificationHistoryPreferenceController.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 NotificationHistoryPreferenceControllerTest {



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private Context mContext;

    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private PreferenceScreen mScreen;



    private NotificationHistoryPreferenceController mController;

    private Preference mPreference;



    private static final String KEY = "notification_history";



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mController = new NotificationHistoryPreferenceController(mContext, KEY);

        mPreference = new Preference(RuntimeEnvironment.application);

        mPreference.setKey(mController.getPreferenceKey());

        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);

    }



    @Test

    public void testIsVisible() {

        mController.displayPreference(mScreen);



        assertThat(mPreference.isVisible()).isTrue();

    }



    @Test

    public void updateState_preferenceSetCheckedWhenSettingIsOn() {

        final TwoStatePreference preference = mock(TwoStatePreference.class);

        final Context context = RuntimeEnvironment.application;

        Settings.Secure.putInt(context.getContentResolver(), NOTIFICATION_HISTORY_ENABLED, ON);



        mController = new NotificationHistoryPreferenceController(context, KEY);

        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(), NOTIFICATION_HISTORY_ENABLED, OFF);



        mController = new NotificationHistoryPreferenceController(context, KEY);

        mController.updateState(preference);



        verify(preference).setChecked(false);

    }



    @Test

    public void isChecked_settingIsOff_shouldReturnFalse() {

        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_HISTORY_ENABLED, OFF);



        assertThat(mController.isChecked()).isFalse();

    }



    @Test

    public void isChecked_settingIsOn_shouldReturnTrue() {

        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_HISTORY_ENABLED, ON);



        assertThat(mController.isChecked()).isTrue();

    }



    @Test

    public void setChecked_setFalse_disablesSetting() {

        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_HISTORY_ENABLED, ON);



        mController.setChecked(false);

        int updatedValue = Settings.Secure.getInt(mContext.getContentResolver(),

                NOTIFICATION_HISTORY_ENABLED, -1);



        assertThat(updatedValue).isEqualTo(OFF);

    }



    @Test

    public void setChecked_setTrue_enablesSetting() {

        Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_HISTORY_ENABLED, OFF);



        mController.setChecked(true);

        int updatedValue = Settings.Secure.getInt(mContext.getContentResolver(),

                NOTIFICATION_HISTORY_ENABLED, -1);



        assertThat(updatedValue).isEqualTo(ON);

    }



    @Test

    public void isSliceable_returnsFalse() {

        assertThat(mController.isSliceable()).isFalse();

    }

}

tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java

+0 −16
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ public class RecentNotifyingAppsPreferenceControllerTest { 
    @Mock

    private Preference mSeeAllPref;

    @Mock

    private PreferenceCategory mDivider;

    @Mock

    private UserManager mUserManager;

    @Mock

    private ApplicationsState mAppState;
@@ -120,8 +118,6 @@ public class RecentNotifyingAppsPreferenceControllerTest { 


        when(mScreen.findPreference(RecentNotifyingAppsPreferenceController.KEY_SEE_ALL))

                .thenReturn(mSeeAllPref);

        when(mScreen.findPreference(RecentNotifyingAppsPreferenceController.KEY_DIVIDER))

                .thenReturn(mDivider);

        when(mCategory.getContext()).thenReturn(mContext);

        when(mHost.getActivity()).thenReturn(mActivity);

    }
@@ -131,16 +127,6 @@ public class RecentNotifyingAppsPreferenceControllerTest { 
        assertThat(mController.isAvailable()).isTrue();

    }



    @Test

    public void doNotIndexCategory() {

        final List<String> nonIndexable = new ArrayList<>();



        mController.updateNonIndexableKeys(nonIndexable);



        assertThat(nonIndexable).containsAllOf(mController.getPreferenceKey(),

                RecentNotifyingAppsPreferenceController.KEY_DIVIDER);

    }



    @Test

    public void onDisplayAndUpdateState_shouldRefreshUi() {

        mController = spy(new RecentNotifyingAppsPreferenceController(
@@ -163,7 +149,6 @@ public class RecentNotifyingAppsPreferenceControllerTest { 
        verify(mCategory).setTitle(null);

        verify(mSeeAllPref).setTitle(R.string.notifications_title);

        verify(mSeeAllPref).setIcon(null);

        verify(mDivider).setVisible(false);

    }



    @Test
@@ -211,7 +196,6 @@ public class RecentNotifyingAppsPreferenceControllerTest { 


        verify(mSeeAllPref).setSummary(null);

        verify(mSeeAllPref).setIcon(R.drawable.ic_chevron_right_24dp);

        verify(mDivider).setVisible(true);

    }



    @Test