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

Commit 0e06e142 authored by Rachel Lee's avatar Rachel Lee Committed by Android (Google) Code Review
Browse files

Merge "Flag WindowManager refresh rate fields for test" into main

parents d6baee0f 34d13517

core/api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3585,8 +3585,8 @@ package android.view { 
    field public static final int ACCESSIBILITY_TITLE_CHANGED = 33554432; // 0x2000000

    field public static final int FLAG_SLIPPERY = 536870912; // 0x20000000

    field public CharSequence accessibilityTitle;

    field public float preferredMaxDisplayRefreshRate;

    field public float preferredMinDisplayRefreshRate;

    field @FlaggedApi("android.view.flags.wm_display_refresh_rate_test") public float preferredMaxDisplayRefreshRate;

    field @FlaggedApi("android.view.flags.wm_display_refresh_rate_test") public float preferredMinDisplayRefreshRate;

    field public int privateFlags;

  }

core/java/android/view/WindowManager.java

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.view;



import static android.content.pm.ActivityInfo.COLOR_MODE_DEFAULT;

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

import static android.view.View.STATUS_BAR_DISABLE_BACK;

import static android.view.View.STATUS_BAR_DISABLE_CLOCK;

import static android.view.View.STATUS_BAR_DISABLE_EXPAND;
@@ -3905,6 +3906,7 @@ public interface WindowManager extends ViewManager { 
         * This value is ignored if {@link #preferredDisplayModeId} is set.

         * @hide

         */

        @FlaggedApi(FLAG_WM_DISPLAY_REFRESH_RATE_TEST)

        @TestApi

        public float preferredMinDisplayRefreshRate;
@@ -3914,6 +3916,7 @@ public interface WindowManager extends ViewManager { 
         * This value is ignored if {@link #preferredDisplayModeId} is set.

         * @hide

         */

        @FlaggedApi(FLAG_WM_DISPLAY_REFRESH_RATE_TEST)

        @TestApi

        public float preferredMaxDisplayRefreshRate;

core/java/android/view/flags/refresh_rate_flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -27,3 +27,10 @@ flag { 
  description: "Enable the `setFrameRate` callback"

  bug: "299946220"

}



flag {

    name: "wm_display_refresh_rate_test"

    namespace: "core_graphics"

    description: "Adds WindowManager display refresh rate fields to test API"

    bug: "304475199"

}
 
 No newline at end of file