Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 690729d6 authored by George Mount's avatar George Mount
Browse files

VRR flag to support velocity mapping 

Bug: 329156130

Uses toolkit_frame_rate_velocity_mapping flag to enable
velocity-based frame rate mapping for dVRR devices.

Test: new test, with and without flag enabled
Change-Id: I99d6cb81b6ec380719b96369de0f8af284dac0ea
parent 46bc6e18

core/java/android/view/ViewRootImpl.java

+12 −3
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ import static android.view.accessibility.Flags.fixMergedContentChangeEventV2; 
import static android.view.accessibility.Flags.forceInvertColor;

import static android.view.accessibility.Flags.reduceWindowContentChangedEventThrottle;

import static android.view.flags.Flags.toolkitFrameRateTypingReadOnly;

import static android.view.flags.Flags.toolkitFrameRateVelocityMappingReadOnly;

import static android.view.flags.Flags.toolkitMetricsForFrameRateDecision;

import static android.view.flags.Flags.toolkitSetFrameRateReadOnly;

import static android.view.flags.Flags.toolkitFrameRateFunctionEnablingReadOnly;
@@ -1154,6 +1155,8 @@ public final class ViewRootImpl implements ViewParent, 
    private static boolean sToolkitFrameRateFunctionEnablingReadOnlyFlagValue;

    private static boolean sToolkitMetricsForFrameRateDecisionFlagValue;

    private static boolean sToolkitFrameRateTypingReadOnlyFlagValue;

    private static boolean sToolkitFrameRateVelocityMappingReadOnlyFlagValue =

            toolkitFrameRateVelocityMappingReadOnly();;















    static {















        sToolkitSetFrameRateReadOnlyFlagValue = toolkitSetFrameRateReadOnly();










@@ -12463,7 +12466,9 @@ public final class ViewRootImpl implements ViewParent,













    }





























    private void setPreferredFrameRateCategory(int preferredFrameRateCategory) {













        if (!shouldSetFrameRateCategory()) {













        if (!shouldSetFrameRateCategory()













                || (mFrameRateCompatibility == FRAME_RATE_COMPATIBILITY_GTE













                && sToolkitFrameRateVelocityMappingReadOnlyFlagValue)) {















            return;















        }















        int categoryFromConflictedFrameRates = FRAME_RATE_CATEGORY_NO_PREFERENCE;










@@ -12558,8 +12563,12 @@ public final class ViewRootImpl implements ViewParent,













    }





























    private void setPreferredFrameRate(float preferredFrameRate) {













        if (!shouldSetFrameRate() || (mFrameRateCompatibility == FRAME_RATE_COMPATIBILITY_GTE













                && preferredFrameRate > 0)) {













        if (!shouldSetFrameRate()) {













            return;













        }













        if (mFrameRateCompatibility == FRAME_RATE_COMPATIBILITY_GTE













                && preferredFrameRate > 0 && !sToolkitFrameRateVelocityMappingReadOnlyFlagValue) {













            mIsTouchBoosting = false;















            return;















        }







































core/tests/coretests/src/android/view/ViewFrameRateTest.java



+40
−0




























Original line number
Diff line number
Diff line








@@ -19,6 +19,8 @@ package android.view;













import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH;















import static android.view.Surface.FRAME_RATE_CATEGORY_LOW;















import static android.view.Surface.FRAME_RATE_CATEGORY_NORMAL;













import static android.view.Surface.FRAME_RATE_COMPATIBILITY_GTE;













import static android.view.flags.Flags.FLAG_TOOLKIT_FRAME_RATE_VELOCITY_MAPPING_READ_ONLY;















import static android.view.flags.Flags.FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY;















import static android.view.flags.Flags.FLAG_VIEW_VELOCITY_API;















import static android.view.flags.Flags.toolkitFrameRateBySizeReadOnly;










@@ -115,6 +117,44 @@ public class ViewFrameRateTest {













        });















    }





























    @Test













    @RequiresFlagsEnabled({FLAG_VIEW_VELOCITY_API,













            FLAG_TOOLKIT_FRAME_RATE_VELOCITY_MAPPING_READ_ONLY})













    public void lowVelocity60() throws Throwable {













        mActivityRule.runOnUiThread(() -> {













            ViewGroup.LayoutParams layoutParams = mMovingView.getLayoutParams();













            layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT;













            layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;













            mMovingView.setLayoutParams(layoutParams);













        });













        waitForFrameRateCategoryToSettle();













        mActivityRule.runOnUiThread(() -> {













            mMovingView.setFrameContentVelocity(1f);













            mMovingView.invalidate();













            assertEquals(60f, mViewRoot.getPreferredFrameRate(), 0f);













            assertEquals(FRAME_RATE_COMPATIBILITY_GTE, mViewRoot.getFrameRateCompatibility());













        });













    }



























    @Test













    @RequiresFlagsEnabled({FLAG_VIEW_VELOCITY_API,













            FLAG_TOOLKIT_FRAME_RATE_VELOCITY_MAPPING_READ_ONLY})













    public void highVelocity140() throws Throwable {













        mActivityRule.runOnUiThread(() -> {













            ViewGroup.LayoutParams layoutParams = mMovingView.getLayoutParams();













            layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT;













            layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;













            mMovingView.setLayoutParams(layoutParams);













        });













        waitForFrameRateCategoryToSettle();













        mActivityRule.runOnUiThread(() -> {













            mMovingView.setFrameContentVelocity(1_000_000_000f);













            mMovingView.invalidate();













            assertEquals(140f, mViewRoot.getPreferredFrameRate(), 0f);













            assertEquals(FRAME_RATE_COMPATIBILITY_GTE, mViewRoot.getFrameRateCompatibility());













        });













    }





























    private void waitForFrameRateCategoryToSettle() throws Throwable {















        for (int i = 0; i < 5; i++) {















            final CountDownLatch drawLatch = new CountDownLatch(1);