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

Commit 85b44962 authored by Michael Wright's avatar Michael Wright Committed by Automerger Merge Worker
Browse files

Merge "Undeprecate LayoutParams.preferredRefreshRate" into tm-dev am: cf4d6368 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17523889



Change-Id: I65fc3bc40d7c4e43064e3ab213046fcff65c2272
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ddfb8c48 cf4d6368

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -51602,7 +51602,7 @@ package android.view { 
    field public String packageName;

    field public boolean preferMinimalPostProcessing;

    field public int preferredDisplayModeId;

    field @Deprecated public float preferredRefreshRate;

    field public float preferredRefreshRate;

    field public int rotationAnimation;

    field public float screenBrightness;

    field public int screenOrientation;

core/java/android/view/WindowManager.java

+0 −2
Original line number Diff line number Diff line
@@ -3107,9 +3107,7 @@ public interface WindowManager extends ViewManager { 
         * This value is ignored if {@link #preferredDisplayModeId} is set.

         *

         * @see Display#getSupportedRefreshRates()

         * @deprecated use {@link #preferredDisplayModeId} instead

         */

        @Deprecated

        public float preferredRefreshRate;



        /**