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

Commit ec9e1f09 authored by Gus Prevas's avatar Gus Prevas
Browse files

Extracts heads-up/pulsing logic from NotificationEntryManager. 

This change introduces the NotificationInterruptionStateProvider
component, which contains all the logic around whether a notification
should heads-up or pulse previously contained in
NotificationEntryManager.

We also introduce the NotificationFilter component which extracts logic
about when to filter notifications from NotificationData, in order to
break a circular dependency that would otherwise be introduced.  As part
of this, some additional fields from the notification ranking map are
denormalized on to the NotificationData.Entry object.

Test: atest SystemUITests, manually
Change-Id: Ic61edca966a3c3e0b01f1a6a9e7ce79c8701da4e
parent e1145f00

packages/CarSystemUI/src/com/android/systemui/CarSystemUIFactory.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -21,9 +21,11 @@ import android.content.Context; 
import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.ViewMediatorCallback;

import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.car.CarNotificationEntryManager;

import com.android.systemui.car.CarNotificationEntryManager;

import com.android.systemui.car.CarNotificationInterruptionStateProvider;

import com.android.systemui.statusbar.car.CarFacetButtonController;

import com.android.systemui.statusbar.car.CarFacetButtonController;

import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager;

import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.volume.CarVolumeDialogComponent;

import com.android.systemui.volume.CarVolumeDialogComponent;

import com.android.systemui.volume.VolumeDialogComponent;

import com.android.systemui.volume.VolumeDialogComponent;
@@ -67,6 +69,12 @@ public class CarSystemUIFactory extends SystemUIFactory { 
        return new CarNotificationEntryManager(context);

        return new CarNotificationEntryManager(context);

    }

    }





    @Override

    public NotificationInterruptionStateProvider provideNotificationInterruptionStateProvider(

            Context context) {

        return new CarNotificationInterruptionStateProvider(context);

    }



    @Module

    @Module

    protected static class ContextHolder {

    protected static class ContextHolder {

        private Context mContext;

        private Context mContext;

packages/CarSystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java

+0 −13
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.car; 




import android.content.Context;

import android.content.Context;





import com.android.systemui.statusbar.notification.NotificationData;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
@@ -39,16 +38,4 @@ public class CarNotificationEntryManager extends NotificationEntryManager { 
        // long click listener.

        // long click listener.

        return null;

        return null;

    }

    }



    @Override

    public boolean shouldHeadsUp(NotificationData.Entry entry) {

        // Because space is usually constrained in the auto use-case, there should not be a

        // pinned notification when the shade has been expanded. Ensure this by not pinning any

        // notification if the shade is already opened.

        if (!getPresenter().isPresenterFullyCollapsed()) {

            return false;

        }



        return super.shouldHeadsUp(entry);

    }

}
 
}

packages/CarSystemUI/src/com/android/systemui/car/CarNotificationInterruptionStateProvider.java

0 → 100644
+42 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2018 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.systemui.car;



import android.content.Context;



import com.android.systemui.statusbar.notification.NotificationData;

import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;



/** Auto-specific implementation of {@link NotificationInterruptionStateProvider}. */

public class CarNotificationInterruptionStateProvider extends

        NotificationInterruptionStateProvider {

    public CarNotificationInterruptionStateProvider(Context context) {

        super(context);

    }



    @Override

    public boolean shouldHeadsUp(NotificationData.Entry entry) {

        // Because space is usually constrained in the auto use-case, there should not be a

        // pinned notification when the shade has been expanded. Ensure this by not pinning any

        // notification if the shade is already opened.

        if (!getPresenter().isPresenterFullyCollapsed()) {

            return false;

        }



        return super.shouldHeadsUp(entry);

    }

}

packages/SystemUI/src/com/android/systemui/Dependency.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,8 @@ import com.android.systemui.statusbar.StatusBarStateController; 
import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.notification.NotificationData.KeyguardEnvironment;

import com.android.systemui.statusbar.notification.NotificationData.KeyguardEnvironment;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationFilter;

import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;

import com.android.systemui.statusbar.notification.NotificationRowBinder;

import com.android.systemui.statusbar.notification.NotificationRowBinder;

import com.android.systemui.statusbar.notification.VisualStabilityManager;

import com.android.systemui.statusbar.notification.VisualStabilityManager;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;
@@ -256,6 +258,8 @@ public class Dependency extends SystemUI { 
    @Inject Lazy<NotificationLogger> mNotificationLogger;

    @Inject Lazy<NotificationLogger> mNotificationLogger;

    @Inject Lazy<NotificationViewHierarchyManager> mNotificationViewHierarchyManager;

    @Inject Lazy<NotificationViewHierarchyManager> mNotificationViewHierarchyManager;

    @Inject Lazy<NotificationRowBinder> mNotificationRowBinder;

    @Inject Lazy<NotificationRowBinder> mNotificationRowBinder;

    @Inject Lazy<NotificationFilter> mNotificationFilter;

    @Inject Lazy<NotificationInterruptionStateProvider> mNotificationInterruptionStateProvider;

    @Inject Lazy<KeyguardDismissUtil> mKeyguardDismissUtil;

    @Inject Lazy<KeyguardDismissUtil> mKeyguardDismissUtil;

    @Inject Lazy<SmartReplyController> mSmartReplyController;

    @Inject Lazy<SmartReplyController> mSmartReplyController;

    @Inject Lazy<RemoteInputQuickSettingsDisabler> mRemoteInputQuickSettingsDisabler;

    @Inject Lazy<RemoteInputQuickSettingsDisabler> mRemoteInputQuickSettingsDisabler;
@@ -425,6 +429,9 @@ public class Dependency extends SystemUI { 
        mProviders.put(NotificationViewHierarchyManager.class,

        mProviders.put(NotificationViewHierarchyManager.class,

                mNotificationViewHierarchyManager::get);

                mNotificationViewHierarchyManager::get);

        mProviders.put(NotificationRowBinder.class, mNotificationRowBinder::get);

        mProviders.put(NotificationRowBinder.class, mNotificationRowBinder::get);

        mProviders.put(NotificationFilter.class, mNotificationFilter::get);

        mProviders.put(NotificationInterruptionStateProvider.class,

                mNotificationInterruptionStateProvider::get);

        mProviders.put(KeyguardDismissUtil.class, mKeyguardDismissUtil::get);

        mProviders.put(KeyguardDismissUtil.class, mKeyguardDismissUtil::get);

        mProviders.put(SmartReplyController.class, mSmartReplyController::get);

        mProviders.put(SmartReplyController.class, mSmartReplyController::get);

        mProviders.put(RemoteInputQuickSettingsDisabler.class,

        mProviders.put(RemoteInputQuickSettingsDisabler.class,

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl; 
import com.android.systemui.statusbar.ScrimView;

import com.android.systemui.statusbar.ScrimView;

import com.android.systemui.statusbar.notification.NotificationData;

import com.android.systemui.statusbar.notification.NotificationData;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;

import com.android.systemui.statusbar.phone.DozeParameters;

import com.android.systemui.statusbar.phone.DozeParameters;

import com.android.systemui.statusbar.phone.KeyguardBouncer;

import com.android.systemui.statusbar.phone.KeyguardBouncer;

import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;

import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;
@@ -198,6 +199,13 @@ public class SystemUIFactory { 
        return new NotificationListener(context);

        return new NotificationListener(context);

    }

    }





    @Singleton

    @Provides

    public NotificationInterruptionStateProvider provideNotificationInterruptionStateProvider(

            Context context) {

        return new NotificationInterruptionStateProvider(context);

    }



    @Module

    @Module

    protected static class ContextHolder {

    protected static class ContextHolder {

        private Context mContext;

        private Context mContext;