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

Commit 7e76c85d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Only save conversation modifications on 'apply'" into rvc-dev

parents 141c3d3c d5cc0ea6

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

+6 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ public class NotificationConversationInfo extends LinearLayout implements 
    private INotificationManager mINotificationManager;

    ShortcutManager mShortcutManager;

    private PackageManager mPm;

    private VisualStabilityManager mVisualStabilityManager;

    private ConversationIconFactory mIconFactory;

    private VisualStabilityManager mVisualStabilityManager;



    private String mPackageName;

    private String mAppName;
@@ -108,7 +108,9 @@ public class NotificationConversationInfo extends LinearLayout implements 
    private TextView mPriorityDescriptionView;

    private TextView mDefaultDescriptionView;

    private TextView mSilentDescriptionView;



    private @Action int mSelectedAction = -1;

    private boolean mPressedApply;



    private OnSnoozeClickListener mOnSnoozeClickListener;

    private OnSettingsClickListener mOnSettingsClickListener;
@@ -160,6 +162,7 @@ public class NotificationConversationInfo extends LinearLayout implements 
    };



    private OnClickListener mOnDone = v -> {

        mPressedApply = true;

        closeControls(v, true);

    };
@@ -521,6 +524,7 @@ public class NotificationConversationInfo extends LinearLayout implements 
        bgHandler.post(

                new UpdateChannelRunnable(mINotificationManager, mPackageName,

                        mAppUid, mSelectedAction, mNotificationChannel));

        mVisualStabilityManager.temporarilyAllowReordering();

    }



    private boolean shouldShowPriorityOnboarding() {
@@ -587,7 +591,7 @@ public class NotificationConversationInfo extends LinearLayout implements 


    @Override

    public boolean shouldBeSaved() {

        return mSelectedAction == ACTION_FAVORITE || mSelectedAction == ACTION_MUTE;

        return mPressedApply;

    }



    @Override

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

+3 −0
Original line number Diff line number Diff line
@@ -597,6 +597,7 @@ public class NotificationConversationInfoTest extends SysuiTestCase { 
                .isEqualTo(GONE);



        // no changes until hit done

        assertFalse(mNotificationInfo.shouldBeSaved());

        verify(mMockINotificationManager, never()).updateNotificationChannelForPackage(

                anyString(), anyInt(), any());

        assertFalse(mConversationChannel.isImportantConversation());
@@ -637,6 +638,7 @@ public class NotificationConversationInfoTest extends SysuiTestCase { 
                .isEqualTo(GONE);



        // no changes until hit done

        assertFalse(mNotificationInfo.shouldBeSaved());

        verify(mMockINotificationManager, never()).updateNotificationChannelForPackage(

                anyString(), anyInt(), any());

        assertFalse(mConversationChannel.isImportantConversation());
@@ -679,6 +681,7 @@ public class NotificationConversationInfoTest extends SysuiTestCase { 
                .isEqualTo(VISIBLE);



        // no changes until save

        assertFalse(mNotificationInfo.shouldBeSaved());

        verify(mMockINotificationManager, never()).updateNotificationChannelForPackage(

                anyString(), anyInt(), any());

        assertEquals(IMPORTANCE_DEFAULT, mConversationChannel.getImportance());