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

Commit a726495f 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 am: 9a1e4632 am: f5e5b53e am: b034aa71 am: 2f78ea5e

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



Change-Id: If40594e4cd008da7f51792d1761450dfb9055ec2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89011776 2f78ea5e

core/java/android/view/View.java

+5 −5
Original line number Diff line number Diff line
@@ -5318,11 +5318,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;
























@@ -22625,6 +22620,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;