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

Commit f5e5b53e 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

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



Change-Id: Iffda70c017c2d0134e81a91a7813e498c78887d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 123a3d41 9a1e4632

core/java/android/view/View.java

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

    @Retention(RetentionPolicy.SOURCE)

    public @interface LayerType {}

    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;







    int mLayerType = LAYER_TYPE_NONE;











    Paint mLayerPaint;







    Paint mLayerPaint;


























@@ -22507,6 +22502,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,









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







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











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







            @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







    @LayerType











    public int getLayerType() {







    public int getLayerType() {











        return mLayerType;







        return mLayerType;