Merge "Move LayerType @ViewDebug.Exported annotation from private field to public method" into main (5314b091) · Commits · e / os / android_frameworks_base

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;