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

Commit 417fc153 authored by Jian-Syuan (Shane) Wong's avatar Jian-Syuan (Shane) Wong Committed by Android (Google) Code Review
Browse files

Merge "Update values for the frame rate category constants" into main

parents 670f7e37 786d858f

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -52464,9 +52464,9 @@ package android.view { 
    field protected static final int[] PRESSED_STATE_SET;

    field protected static final int[] PRESSED_WINDOW_FOCUSED_STATE_SET;

    field @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public static final float REQUESTED_FRAME_RATE_CATEGORY_DEFAULT = 0.0f;

    field @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public static final float REQUESTED_FRAME_RATE_CATEGORY_HIGH = -120.0f;

    field @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public static final float REQUESTED_FRAME_RATE_CATEGORY_LOW = -30.0f;

    field @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public static final float REQUESTED_FRAME_RATE_CATEGORY_NORMAL = -60.0f;

    field @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public static final float REQUESTED_FRAME_RATE_CATEGORY_HIGH = -4.0f;

    field @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public static final float REQUESTED_FRAME_RATE_CATEGORY_LOW = -2.0f;

    field @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public static final float REQUESTED_FRAME_RATE_CATEGORY_NORMAL = -3.0f;

    field @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public static final float REQUESTED_FRAME_RATE_CATEGORY_NO_PREFERENCE = -1.0f;

    field public static final android.util.Property<android.view.View,java.lang.Float> ROTATION;

    field public static final android.util.Property<android.view.View,java.lang.Float> ROTATION_X;

core/java/android/view/View.java

+3 −3
Original line number Diff line number Diff line
@@ -5546,11 +5546,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    @FlaggedApi(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY)

    public static final float REQUESTED_FRAME_RATE_CATEGORY_NO_PREFERENCE = -1;

    @FlaggedApi(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY)

    public static final float REQUESTED_FRAME_RATE_CATEGORY_LOW = -30;

    public static final float REQUESTED_FRAME_RATE_CATEGORY_LOW = -2;

    @FlaggedApi(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY)

    public static final float REQUESTED_FRAME_RATE_CATEGORY_NORMAL = -60;

    public static final float REQUESTED_FRAME_RATE_CATEGORY_NORMAL = -3;

    @FlaggedApi(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY)

    public static final float REQUESTED_FRAME_RATE_CATEGORY_HIGH = -120;

    public static final float REQUESTED_FRAME_RATE_CATEGORY_HIGH = -4;















    /**















     * Simple constructor to use when creating a view from code.