Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only save conversation modifications on 'apply'" into rvc-dev am: 7e76c85d57

Browse Source 
Change-Id: I2bdc77d37044b544b68ac9d4e95df3d5f955ec9e
This commit is contained in:
TreeHugger Robot
2020-04-24 19:03:05 +00:00
committed by Automerger Merge Worker
parent 0e223fc93b 7e76c85d57
commit bc99d19d56
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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());