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

Commit 9a1e4632 authored by Mark Hansen's avatar Mark Hansen Committed by Automerger Merge Worker
Browse files

Merge "Move LayerType @ViewDebug.Exported annotation from private field to... 

Merge "Move LayerType @ViewDebug.Exported annotation from private field to public method" into main am: 5314b091

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



Change-Id: If4f062994bd8af5c7dd1e39eed9e948c451fa765
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df4e70bb 5314b091

core/java/android/view/View.java

+5 −5
Original line number Diff line number Diff line
@@ -5223,11 +5223,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    @Retention(RetentionPolicy.SOURCE)

    public @interface LayerType {}













    @ViewDebug.ExportedProperty(category = "drawing", mapping = {













            @ViewDebug.IntToString(from = LAYER_TYPE_NONE, to = "NONE"),













            @ViewDebug.IntToString(from = LAYER_TYPE_SOFTWARE, to = "SOFTWARE"),













            @ViewDebug.IntToString(from = LAYER_TYPE_HARDWARE, to = "HARDWARE")













    })















    int mLayerType = LAYER_TYPE_NONE;















    Paint mLayerPaint;
























@@ -21888,6 +21883,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













            @EnumEntry(value = LAYER_TYPE_SOFTWARE, name = "software"),















            @EnumEntry(value = LAYER_TYPE_HARDWARE, name = "hardware")















    })













    @ViewDebug.ExportedProperty(category = "drawing", mapping = {













            @ViewDebug.IntToString(from = LAYER_TYPE_NONE, to = "NONE"),













            @ViewDebug.IntToString(from = LAYER_TYPE_SOFTWARE, to = "SOFTWARE"),













            @ViewDebug.IntToString(from = LAYER_TYPE_HARDWARE, to = "HARDWARE")













    })















    @LayerType















    public int getLayerType() {















        return mLayerType;