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

Merge "Cache Display.Mode so we can ignore refresh rate changes" into rvc-d1-dev

Browse Source
This commit is contained in:
Evan Laird
2020-07-08 23:11:36 +00:00
committed by Android (Google) Code Review
parent fac896ec46 c2bae89e36
commit b2641d1d13
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
View File

@@ -62,6 +62,7 @@ import android.os.UserHandle;
import android.provider.Settings.Secure; import android.provider.Settings.Secure;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.view.Display;
import android.view.DisplayCutout; import android.view.DisplayCutout;
import android.view.DisplayCutout.BoundsPosition; import android.view.DisplayCutout.BoundsPosition;
import android.view.DisplayInfo; import android.view.DisplayInfo;
@@ -820,6 +821,7 @@ public class ScreenDecorations extends SystemUI implements Tunable {
private static final float HIDDEN_CAMERA_PROTECTION_SCALE = 0.5f; private static final float HIDDEN_CAMERA_PROTECTION_SCALE = 0.5f;
private Display.Mode mDisplayMode = null;
private final DisplayInfo mInfo = new DisplayInfo(); private final DisplayInfo mInfo = new DisplayInfo();
private final Paint mPaint = new Paint(); private final Paint mPaint = new Paint();
private final List<Rect> mBounds = new ArrayList(); private final List<Rect> mBounds = new ArrayList();
@@ -904,11 +906,33 @@ public class ScreenDecorations extends SystemUI implements Tunable {
@Override @Override
public void onDisplayChanged(int displayId) { public void onDisplayChanged(int displayId) {
Display.Mode oldMode = mDisplayMode;
mDisplayMode = getDisplay().getMode();
// Display mode hasn't meaningfully changed, we can ignore it
if (!modeChanged(oldMode, mDisplayMode)) {
return;
}
if (displayId == getDisplay().getDisplayId()) { if (displayId == getDisplay().getDisplayId()) {
update(); update();
} }
} }
private boolean modeChanged(Display.Mode oldMode, Display.Mode newMode) {
if (oldMode == null) {
return true;
}
boolean changed = false;
changed |= oldMode.getPhysicalHeight() != newMode.getPhysicalHeight();
changed |= oldMode.getPhysicalWidth() != newMode.getPhysicalWidth();
// We purposely ignore refresh rate and id changes here, because we don't need to
// invalidate for those, and they can trigger the refresh rate to increase
return changed;
}
public void setRotation(int rotation) { public void setRotation(int rotation) {
mRotation = rotation; mRotation = rotation;
update(); update();