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

Commit 60e9272c authored by George Mount's avatar George Mount
Browse files

Support LOW refresh rate for small Views 

Bug: 329156449

Small Views (30dp x 30dp or 10dp in one dimension) now request
a LOW (~30fps) refresh rate by default.

Test: modified tests
Change-Id: I97df4fd771f47eb22901d063a88343c363caeec8
parent 72aff073

core/java/android/view/View.java

+4 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 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.enableUseMeasureCacheDuringForceLayout;

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

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

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

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

import static android.view.flags.Flags.toolkitSetFrameRateReadOnly;
@@ -33771,7 +33772,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
                    || heightDp <= FRAME_RATE_NARROW_THRESHOLD

                    || (widthDp <= FRAME_RATE_SMALL_SIZE_THRESHOLD

                    && heightDp <= FRAME_RATE_SMALL_SIZE_THRESHOLD)) {

                return FRAME_RATE_CATEGORY_NORMAL | FRAME_RATE_CATEGORY_REASON_SMALL;

                int category = toolkitFrameRateBySizeReadOnly()

                        ? FRAME_RATE_CATEGORY_LOW : FRAME_RATE_CATEGORY_NORMAL;

                return category | FRAME_RATE_CATEGORY_REASON_SMALL;

            } else {

                int category = toolkitFrameRateDefaultNormalReadOnly()

                        ? FRAME_RATE_CATEGORY_NORMAL : FRAME_RATE_CATEGORY_HIGH;

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

+16 −9
Original line number Diff line number Diff line
@@ -16,9 +16,13 @@ 


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.flags.Flags.FLAG_TOOLKIT_FRAME_RATE_DEFAULT_NORMAL_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;

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



import static junit.framework.Assert.assertEquals;
@@ -145,8 +149,9 @@ public class ViewFrameRateTest { 
        // Now that it is small, any invalidation should have a normal category

        mActivityRule.runOnUiThread(() -> {

            mMovingView.invalidate();

            assertEquals(Surface.FRAME_RATE_CATEGORY_NORMAL,

                    mViewRoot.getPreferredFrameRateCategory());

            int expected = toolkitFrameRateBySizeReadOnly()

                    ? FRAME_RATE_CATEGORY_LOW : FRAME_RATE_CATEGORY_NORMAL;

            assertEquals(expected, mViewRoot.getPreferredFrameRateCategory());

        });

    }
@@ -169,8 +174,9 @@ public class ViewFrameRateTest { 
        // Now that it is small, any invalidation should have a normal category

        mActivityRule.runOnUiThread(() -> {

            mMovingView.invalidate();

            assertEquals(Surface.FRAME_RATE_CATEGORY_NORMAL,

                    mViewRoot.getPreferredFrameRateCategory());

            int expected = toolkitFrameRateBySizeReadOnly()

                    ? FRAME_RATE_CATEGORY_LOW : FRAME_RATE_CATEGORY_NORMAL;

            assertEquals(expected, mViewRoot.getPreferredFrameRateCategory());

        });

    }
@@ -193,8 +199,9 @@ public class ViewFrameRateTest { 
        // Now that it is small, any invalidation should have a normal category

        mActivityRule.runOnUiThread(() -> {

            mMovingView.invalidate();

            assertEquals(Surface.FRAME_RATE_CATEGORY_NORMAL,

                    mViewRoot.getPreferredFrameRateCategory());

            int expected = toolkitFrameRateBySizeReadOnly()

                    ? FRAME_RATE_CATEGORY_LOW : FRAME_RATE_CATEGORY_NORMAL;

            assertEquals(expected, mViewRoot.getPreferredFrameRateCategory());

        });

    }
@@ -218,7 +225,7 @@ public class ViewFrameRateTest { 
        mActivityRule.runOnUiThread(() -> {

            mMovingView.invalidate();

            int expected = toolkitFrameRateDefaultNormalReadOnly()

                    ? Surface.FRAME_RATE_CATEGORY_NORMAL : Surface.FRAME_RATE_CATEGORY_HIGH;

                    ? FRAME_RATE_CATEGORY_NORMAL : FRAME_RATE_CATEGORY_HIGH;

            assertEquals(expected, mViewRoot.getPreferredFrameRateCategory());

        });

    }
@@ -243,7 +250,7 @@ public class ViewFrameRateTest { 
        mActivityRule.runOnUiThread(() -> {

            mMovingView.invalidate();

            int expected = toolkitFrameRateDefaultNormalReadOnly()

                    ? Surface.FRAME_RATE_CATEGORY_NORMAL : Surface.FRAME_RATE_CATEGORY_HIGH;

                    ? FRAME_RATE_CATEGORY_NORMAL : FRAME_RATE_CATEGORY_HIGH;

            assertEquals(expected, mViewRoot.getPreferredFrameRateCategory());

        });

    }
@@ -255,7 +262,7 @@ public class ViewFrameRateTest { 
        waitForFrameRateCategoryToSettle();

        mActivityRule.runOnUiThread(() -> {

            mMovingView.invalidate();

            assertEquals(Surface.FRAME_RATE_CATEGORY_NORMAL,

            assertEquals(FRAME_RATE_CATEGORY_NORMAL,

                    mViewRoot.getPreferredFrameRateCategory());

        });

    }