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

Commit a113a835 authored by Shane's avatar Shane
Browse files

Trigger touch boost when the viewVisibility of ViewRootImpl changed 

This main purpose of this CL is to trigger touch boost when when the viewVisibility of ViewRootImpl is changed and the visibility is visible.

Also, having frame rate boost when a ViewRootImpl is first available.

This can ensure the transitions / animations are smooth after a laucher
is lauching a new window.

Test: atest ViewRootImplTest
Bug: 315141420
Change-Id: Ib61775ed4c13142d73bdbe6a577fe61e2635984e
parent 0cd20302

core/java/android/view/ViewRootImpl.java

+28 −1
Original line number Original line Diff line number Diff line
@@ -3218,6 +3218,12 @@ public final class ViewRootImpl implements ViewParent, 
                endDragResizing();

                endDragResizing();

                destroyHardwareResources();

                destroyHardwareResources();

            }

            }



            if (sToolkitSetFrameRateReadOnlyFlagValue && viewVisibility == View.VISIBLE) {

                // Boost frame rate when the viewVisibility becomes true.

                // This is mainly for lanuchers that lanuch new windows.

                boostFrameRate(FRAME_RATE_TOUCH_BOOST_TIME);

            }

        }

        }





        // Non-visible windows can't hold accessibility focus.

        // Non-visible windows can't hold accessibility focus.
@@ -3927,6 +3933,11 @@ public final class ViewRootImpl implements ViewParent, 
                    focused.restoreDefaultFocus();

                    focused.restoreDefaultFocus();

                }

                }

            }

            }



            if (sToolkitSetFrameRateReadOnlyFlagValue) {

                // Boost the frame rate when the ViewRootImpl first becomes available.

                boostFrameRate(FRAME_RATE_TOUCH_BOOST_TIME);

            }

        }

        }





        final boolean changedVisibility = (viewVisibilityChanged || mFirst) && isViewVisible;

        final boolean changedVisibility = (viewVisibilityChanged || mFirst) && isViewVisible;
@@ -12115,6 +12126,22 @@ public final class ViewRootImpl implements ViewParent, 
        return mPreferredFrameRate;

        return mPreferredFrameRate;

    }

    }





    /**

     * Get the value of mIsFrameRateBoosting

     */

    @VisibleForTesting

    public boolean getIsFrameRateBoosting() {

        return mIsFrameRateBoosting;

    }



    private void boostFrameRate(int boostTimeOut) {

        mIsFrameRateBoosting = true;

        setPreferredFrameRateCategory(mPreferredFrameRateCategory);

        mHandler.removeMessages(MSG_TOUCH_BOOST_TIMEOUT);

        mHandler.sendEmptyMessageDelayed(MSG_TOUCH_BOOST_TIMEOUT,

                boostTimeOut);

    }



    @Override

    @Override

    public boolean transferHostTouchGestureToEmbedded(

    public boolean transferHostTouchGestureToEmbedded(

            @NonNull SurfaceControlViewHost.SurfacePackage surfacePackage) {

            @NonNull SurfaceControlViewHost.SurfacePackage surfacePackage) {

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -472,6 +472,7 @@ public class ViewRootImplTest { 
     * Test the value of the frame rate cateogry based on the visibility of a view

     * Test the value of the frame rate cateogry based on the visibility of a view

     * Invsible: FRAME_RATE_CATEGORY_NO_PREFERENCE

     * Invsible: FRAME_RATE_CATEGORY_NO_PREFERENCE

     * Visible: FRAME_RATE_CATEGORY_NORMAL

     * Visible: FRAME_RATE_CATEGORY_NORMAL

     * Also, mIsFrameRateBoosting should be true when the visibility becomes visible

     */

     */

    @Test

    @Test

    @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY)

    @RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY)
@@ -485,6 +486,7 @@ public class ViewRootImplTest { 
            assertEquals(viewRootImpl.getPreferredFrameRateCategory(),

            assertEquals(viewRootImpl.getPreferredFrameRateCategory(),

                    FRAME_RATE_CATEGORY_NO_PREFERENCE);

                    FRAME_RATE_CATEGORY_NO_PREFERENCE);

        });

        });

        sInstrumentation.waitForIdleSync();





        sInstrumentation.runOnMainSync(() -> {

        sInstrumentation.runOnMainSync(() -> {

            view.setVisibility(View.VISIBLE);

            view.setVisibility(View.VISIBLE);
@@ -492,6 +494,11 @@ public class ViewRootImplTest { 
            assertEquals(viewRootImpl.getPreferredFrameRateCategory(),

            assertEquals(viewRootImpl.getPreferredFrameRateCategory(),

                    FRAME_RATE_CATEGORY_NORMAL);

                    FRAME_RATE_CATEGORY_NORMAL);

        });

        });

        sInstrumentation.waitForIdleSync();



        sInstrumentation.runOnMainSync(() -> {

            assertEquals(viewRootImpl.getIsFrameRateBoosting(), true);

        });

    }

    }





    /**

    /**