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

Merge "Changing importance should record user locked field." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-12 01:40:55 +00:00
committed by Android (Google) Code Review
parent fac61e4928 8ceb579ec7
commit f61985f02e
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java
View File

@@ -274,6 +274,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
MetricsLogger.action(mContext, MetricsEvent.ACTION_SAVE_IMPORTANCE, MetricsLogger.action(mContext, MetricsEvent.ACTION_SAVE_IMPORTANCE,
selectedImportance - mStartingUserImportance); selectedImportance - mStartingUserImportance);
mSingleNotificationChannel.setImportance(selectedImportance); mSingleNotificationChannel.setImportance(selectedImportance);
mSingleNotificationChannel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
try { try {
mINotificationManager.updateNotificationChannelForPackage( mINotificationManager.updateNotificationChannelForPackage(
mPkg, mAppUid, mSingleNotificationChannel); mPkg, mAppUid, mSingleNotificationChannel);

10
packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationInfoTest.java
View File

@@ -61,6 +61,7 @@ import com.android.systemui.SysuiTestCase;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -585,11 +586,16 @@ public class NotificationInfoTest extends SysuiTestCase {
mNotificationChannel.getImportance(), mSbn, null, null, null, mNotificationChannel.getImportance(), mSbn, null, null, null,
null, Collections.singleton(TEST_PACKAGE_NAME)); null, Collections.singleton(TEST_PACKAGE_NAME));
Switch enabledSwitch = (Switch) mNotificationInfo.findViewById(R.id.channel_enabled_switch); Switch enabledSwitch = mNotificationInfo.findViewById(R.id.channel_enabled_switch);
enabledSwitch.setChecked(false); enabledSwitch.setChecked(false);
mNotificationInfo.handleCloseControls(true); mNotificationInfo.handleCloseControls(true);
ArgumentCaptor<NotificationChannel> updated =
ArgumentCaptor.forClass(NotificationChannel.class);
verify(mMockINotificationManager, times(1)).updateNotificationChannelForPackage( verify(mMockINotificationManager, times(1)).updateNotificationChannelForPackage(
eq(TEST_PACKAGE_NAME), anyInt(), eq(mNotificationChannel)); anyString(), anyInt(), updated.capture());
assertTrue((updated.getValue().getUserLockedFields()
& NotificationChannel.USER_LOCKED_IMPORTANCE) != 0);
} }
@Test @Test