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

Merge "Respect the preferred refresh rate" into tm-qpr-dev am: a07074fe57 am: 0731b48f81

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20870165

Change-Id: I02e5065bfd4cd487e7244faa69b09a895e38e225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly Tai
2023-01-12 19:47:43 +00:00
committed by Automerger Merge Worker
parent a43dbaae9b 0731b48f81
commit f82c49c234
2 changed files with 73 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java
View File

@@ -321,9 +321,12 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
&& !state.mKeyguardFadingAway && !state.mKeyguardGoingAway;
if (onKeyguard
&& mAuthController.isUdfpsEnrolled(KeyguardUpdateMonitor.getCurrentUser())) {
// both max and min display refresh rate must be set to take effect:
mLpChanged.preferredMaxDisplayRefreshRate = mKeyguardPreferredRefreshRate;
mLpChanged.preferredMinDisplayRefreshRate = mKeyguardPreferredRefreshRate;
} else {
mLpChanged.preferredMaxDisplayRefreshRate = 0;
mLpChanged.preferredMinDisplayRefreshRate = 0;
}
Trace.setCounter("display_set_preferred_refresh_rate",
(long) mKeyguardPreferredRefreshRate);

71
packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java
View File

@@ -46,11 +46,14 @@ import android.view.WindowManager;
import androidx.test.filters.SmallTest;
import com.android.internal.colorextraction.ColorExtractor;
import com.android.systemui.R;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.biometrics.AuthController;
import com.android.systemui.colorextraction.SysuiColorExtractor;
import com.android.systemui.dump.DumpManager;
import com.android.systemui.keyguard.KeyguardViewMediator;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.statusbar.StatusBarState;
import com.android.systemui.statusbar.SysuiStatusBarStateController;
import com.android.systemui.statusbar.phone.DozeParameters;
import com.android.systemui.statusbar.phone.KeyguardBypassController;
@@ -68,6 +71,8 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
import java.util.List;
@RunWith(AndroidTestingRunner.class)
@RunWithLooper
@SmallTest
@@ -91,13 +96,21 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase {
@Mock private ShadeExpansionStateManager mShadeExpansionStateManager;
@Mock private ShadeWindowLogger mShadeWindowLogger;
@Captor private ArgumentCaptor<WindowManager.LayoutParams> mLayoutParameters;
@Captor private ArgumentCaptor<StatusBarStateController.StateListener> mStateListener;
private NotificationShadeWindowControllerImpl mNotificationShadeWindowController;
private float mPreferredRefreshRate = -1;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
// Preferred refresh rate is equal to the first displayMode's refresh rate
mPreferredRefreshRate = mContext.getDisplay().getSupportedModes()[0].getRefreshRate();
overrideResource(
R.integer.config_keyguardRefreshRate,
(int) mPreferredRefreshRate
);
when(mDozeParameters.getAlwaysOn()).thenReturn(true);
when(mColorExtractor.getNeutralColors()).thenReturn(mGradientColors);
@@ -117,6 +130,7 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase {
mNotificationShadeWindowController.attach();
verify(mWindowManager).addView(eq(mNotificationShadeWindowView), any());
verify(mStatusBarStateController).addCallback(mStateListener.capture(), anyInt());
}
@Test
@@ -334,4 +348,59 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase {
assertThat(mLayoutParameters.getValue().screenOrientation)
.isEqualTo(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
}
@Test
public void udfpsEnrolled_minAndMaxRefreshRateSetToPreferredRefreshRate() {
// GIVEN udfps is enrolled
when(mAuthController.isUdfpsEnrolled(anyInt())).thenReturn(true);
// WHEN keyguard is showing
setKeyguardShowing();
// THEN min and max refresh rate is set to the preferredRefreshRate
verify(mWindowManager, atLeastOnce()).updateViewLayout(any(), mLayoutParameters.capture());
final List<WindowManager.LayoutParams> lpList = mLayoutParameters.getAllValues();
final WindowManager.LayoutParams lp = lpList.get(lpList.size() - 1);
assertThat(lp.preferredMaxDisplayRefreshRate).isEqualTo(mPreferredRefreshRate);
assertThat(lp.preferredMinDisplayRefreshRate).isEqualTo(mPreferredRefreshRate);
}
@Test
public void udfpsNotEnrolled_refreshRateUnset() {
// GIVEN udfps is NOT enrolled
when(mAuthController.isUdfpsEnrolled(anyInt())).thenReturn(false);
// WHEN keyguard is showing
setKeyguardShowing();
// THEN min and max refresh rate aren't set (set to 0)
verify(mWindowManager, atLeastOnce()).updateViewLayout(any(), mLayoutParameters.capture());
final List<WindowManager.LayoutParams> lpList = mLayoutParameters.getAllValues();
final WindowManager.LayoutParams lp = lpList.get(lpList.size() - 1);
assertThat(lp.preferredMaxDisplayRefreshRate).isEqualTo(0);
assertThat(lp.preferredMinDisplayRefreshRate).isEqualTo(0);
}
@Test
public void keyguardNotShowing_refreshRateUnset() {
// GIVEN UDFPS is enrolled
when(mAuthController.isUdfpsEnrolled(anyInt())).thenReturn(true);
// WHEN keyguard is NOT showing
mNotificationShadeWindowController.setKeyguardShowing(false);
// THEN min and max refresh rate aren't set (set to 0)
verify(mWindowManager, atLeastOnce()).updateViewLayout(any(), mLayoutParameters.capture());
final List<WindowManager.LayoutParams> lpList = mLayoutParameters.getAllValues();
final WindowManager.LayoutParams lp = lpList.get(lpList.size() - 1);
assertThat(lp.preferredMaxDisplayRefreshRate).isEqualTo(0);
assertThat(lp.preferredMinDisplayRefreshRate).isEqualTo(0);
}
private void setKeyguardShowing() {
mNotificationShadeWindowController.setKeyguardShowing(true);
mNotificationShadeWindowController.setKeyguardGoingAway(false);
mNotificationShadeWindowController.setKeyguardFadingAway(false);
mStateListener.getValue().onStateChanged(StatusBarState.KEYGUARD);
}
}