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

Commit f8894a86 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Remove dead snooze code 

Bug: 187480963
Test: manual snooze testing
Change-Id: Icb5b664c677efe95fb3ce5e5c28122d1037d75a5
parent 551a988b

packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/NotificationSwipeActionHelper.java

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ public interface NotificationSwipeActionHelper { 
     */

    public void snooze(StatusBarNotification sbn, SnoozeOption snoozeOption);



    public void snooze(StatusBarNotification sbn, int hours);



    public float getMinDismissVelocity();



    public boolean isDismissGesture(MotionEvent ev);

packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsController.kt

+0 −1
Original line number Diff line number Diff line
@@ -48,6 +48,5 @@ interface NotificationsController { 
    fun resetUserExpandedStates()

    fun setNotificationSnoozed(sbn: StatusBarNotification, snoozeOption: SnoozeOption)

    fun getActiveNotificationsCount(): Int

    fun setNotificationSnoozed(sbn: StatusBarNotification, hoursToSnooze: Int)

    fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<String>, dumpTruck: Boolean)

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt

+0 −6
Original line number Diff line number Diff line
@@ -171,10 +171,4 @@ class NotificationsControllerImpl @Inject constructor( 
    override fun getActiveNotificationsCount(): Int {

        return entryManager.activeNotificationsCount

    }



    override fun setNotificationSnoozed(sbn: StatusBarNotification, hoursToSnooze: Int) {

        notificationListener.snoozeNotification(

                sbn.key,

                hoursToSnooze * 60 * 60 * 1000.toLong())

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerStub.kt

+0 −3
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ class NotificationsControllerStub @Inject constructor( 
    override fun setNotificationSnoozed(sbn: StatusBarNotification, snoozeOption: SnoozeOption) {

    }



    override fun setNotificationSnoozed(sbn: StatusBarNotification, hoursToSnooze: Int) {

    }



    override fun getActiveNotificationsCount(): Int {

        return 0

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java

+0 −23
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ public class NotificationConversationInfo extends LinearLayout implements 
    private @Action int mSelectedAction = -1;

    private boolean mPressedApply;



    private OnSnoozeClickListener mOnSnoozeClickListener;

    private OnSettingsClickListener mOnSettingsClickListener;

    private NotificationGuts mGutsContainer;

    private OnConversationSettingsClickListener mOnConversationSettingsClickListener;
@@ -134,22 +133,6 @@ public class NotificationConversationInfo extends LinearLayout implements 
    static final int ACTION_MUTE = 4;

    static final int ACTION_SETTINGS = 5;



    // TODO: b/152050825

    /*

    private OnClickListener mOnHomeClick = v -> {

        mSelectedAction = ACTION_HOME;

        mShortcutManager.requestPinShortcut(mShortcutInfo, null);

        mShadeController.animateCollapsePanels();

        mGutsContainer.closeControls(v, true);

    };



    private OnClickListener mOnSnoozeClick = v -> {

        mSelectedAction = ACTION_SNOOZE;

        mOnSnoozeClickListener.onClick(v, 1);

        mGutsContainer.closeControls(v, true);

    };

    */



    private OnClickListener mOnFavoriteClick = v -> {

        setSelectedAction(ACTION_FAVORITE);

        updateToggleActions(mSelectedAction, true);
@@ -193,10 +176,6 @@ public class NotificationConversationInfo extends LinearLayout implements 
        void onClick(View v, Intent intent);

    }



    public interface OnSnoozeClickListener {

        void onClick(View v, int hoursToSnooze);

    }



    @VisibleForTesting

    void setSelectedAction(int selectedAction) {

        if (mSelectedAction == selectedAction) {
@@ -218,7 +197,6 @@ public class NotificationConversationInfo extends LinearLayout implements 
            NotificationEntry entry,

            Notification.BubbleMetadata bubbleMetadata,

            OnSettingsClickListener onSettingsClick,

            OnSnoozeClickListener onSnoozeClickListener,

            ConversationIconFactory conversationIconFactory,

            Context userContext,

            boolean isDeviceProvisioned,
@@ -242,7 +220,6 @@ public class NotificationConversationInfo extends LinearLayout implements 
        mAppUid = mSbn.getUid();

        mDelegatePkg = mSbn.getOpPkg();

        mIsDeviceProvisioned = isDeviceProvisioned;

        mOnSnoozeClickListener = onSnoozeClickListener;

        mOnConversationSettingsClickListener = onConversationSettingsClickListener;

        mIconFactory = conversationIconFactory;

        mUserContext = userContext;