Merge "Fixed a test for app ops icons" into rvc-dev am: 0c33b0a842 am: 29700c2041 (b5218b9e) · Commits · e / os / android_frameworks_base

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

+12 −4

Original line number	Diff line number	Diff line
		@@ -130,11 +130,19 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper {
		if (mNotificationHeader != null) {
		mNotificationHeader.setAppOpsOnClickListener(listener);
		}
		if (mAppOps != null) {
		mAppOps.setOnClickListener(listener);
		}
		if (mCameraIcon != null) {
		mCameraIcon.setOnClickListener(listener);
		}
		if (mMicIcon != null) {
		mMicIcon.setOnClickListener(listener);
		}
		if (mOverlayIcon != null) {
		mOverlayIcon.setOnClickListener(listener);
		}
		}

		/**
		* Shows or hides 'app op in use' icons based on app usage.

+3 −3

Original line number	Diff line number	Diff line
		@@ -76,13 +76,13 @@ public class NotificationContentViewTest extends SysuiTestCase {
		@Test
		@UiThreadTest
		public void testShowAppOpsIcons() {
		View mockContracted = mock(View.class);
		View mockContracted = mock(NotificationHeaderView.class);
		when(mockContracted.findViewById(com.android.internal.R.id.mic))
		.thenReturn(mockContracted);
		View mockExpanded = mock(View.class);
		View mockExpanded = mock(NotificationHeaderView.class);
		when(mockExpanded.findViewById(com.android.internal.R.id.mic))
		.thenReturn(mockExpanded);
		View mockHeadsUp = mock(View.class);
		View mockHeadsUp = mock(NotificationHeaderView.class);
		when(mockHeadsUp.findViewById(com.android.internal.R.id.mic))
		.thenReturn(mockHeadsUp);