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

Merge "Fixed an issue where icons could be stuck overlapping" into rvc-dev

Browse Source
This commit is contained in:
Selim Cinek
2020-06-03 18:45:27 +00:00
committed by Android (Google) Code Review
parent 161d39b45d b750abc8c5
commit 978cb2fe8c
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
View File

@@ -572,6 +572,9 @@ public class NotificationIconAreaController implements DarkReceiver,
.setInterpolator(Interpolators.LINEAR) .setInterpolator(Interpolators.LINEAR)
.setDuration(AOD_ICONS_APPEAR_DURATION) .setDuration(AOD_ICONS_APPEAR_DURATION)
.start(); .start();
} else {
mAodIcons.setAlpha(1.0f);
mAodIcons.setTranslationY(0);
} }
} }

13
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationIconAreaControllerTest.java
View File

@@ -19,6 +19,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.testing.AndroidTestingRunner; import android.testing.AndroidTestingRunner;
@@ -56,6 +57,8 @@ public class NotificationIconAreaControllerTest extends SysuiTestCase {
@Mock @Mock
NotificationMediaManager mNotificationMediaManager; NotificationMediaManager mNotificationMediaManager;
@Mock @Mock
NotificationIconContainer mNotificationIconContainer;
@Mock
DozeParameters mDozeParameters; DozeParameters mDozeParameters;
@Mock @Mock
NotificationShadeWindowView mNotificationShadeWindowView; NotificationShadeWindowView mNotificationShadeWindowView;
@@ -67,7 +70,7 @@ public class NotificationIconAreaControllerTest extends SysuiTestCase {
when(mStatusBar.getNotificationShadeWindowView()).thenReturn(mNotificationShadeWindowView); when(mStatusBar.getNotificationShadeWindowView()).thenReturn(mNotificationShadeWindowView);
when(mNotificationShadeWindowView.findViewById(anyInt())).thenReturn( when(mNotificationShadeWindowView.findViewById(anyInt())).thenReturn(
mock(NotificationIconContainer.class)); mNotificationIconContainer);
mController = new NotificationIconAreaController(mContext, mStatusBar, mController = new NotificationIconAreaController(mContext, mStatusBar,
mStatusBarStateController, mWakeUpCoordinator, mKeyguardBypassController, mStatusBarStateController, mWakeUpCoordinator, mKeyguardBypassController,
@@ -87,4 +90,12 @@ public class NotificationIconAreaControllerTest extends SysuiTestCase {
assertTrue(mController.shouldShouldLowPriorityIcons()); assertTrue(mController.shouldShouldLowPriorityIcons());
} }
@Test
public void testAppearResetsTranslation() {
when(mDozeParameters.shouldControlScreenOff()).thenReturn(false);
mController.appearAodIcons();
verify(mNotificationIconContainer).setTranslationY(0);
verify(mNotificationIconContainer).setAlpha(1.0f);
}
} }