Merge "Update to ToT RemoteCompose" into main (10bdc209) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java

+200 −28

Original line number	Diff line number	Diff line
		@@ -15,12 +15,14 @@
		*/
		package com.android.internal.widget.remotecompose.core;

		import android.annotation.NonNull;
		import android.annotation.Nullable;

		import com.android.internal.widget.remotecompose.core.operations.ComponentValue;
		import com.android.internal.widget.remotecompose.core.operations.IntegerExpression;
		import com.android.internal.widget.remotecompose.core.operations.NamedVariable;
		import com.android.internal.widget.remotecompose.core.operations.RootContentBehavior;
		import com.android.internal.widget.remotecompose.core.operations.Theme;
		import com.android.internal.widget.remotecompose.core.operations.layout.ClickModifierEnd;
		import com.android.internal.widget.remotecompose.core.operations.layout.ClickModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.Component;
		import com.android.internal.widget.remotecompose.core.operations.layout.ComponentEnd;
		@@ -28,7 +30,11 @@ import com.android.internal.widget.remotecompose.core.operations.layout.Componen
		import com.android.internal.widget.remotecompose.core.operations.layout.LayoutComponent;
		import com.android.internal.widget.remotecompose.core.operations.layout.LoopEnd;
		import com.android.internal.widget.remotecompose.core.operations.layout.LoopOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.OperationsListEnd;
		import com.android.internal.widget.remotecompose.core.operations.layout.RootLayoutComponent;
		import com.android.internal.widget.remotecompose.core.operations.layout.TouchCancelModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.TouchDownModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.TouchUpModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.ComponentModifiers;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.ModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.utilities.StringSerializer;
		@@ -49,12 +55,12 @@ public class CoreDocument {

		ArrayList<Operation> mOperations;

		RootLayoutComponent mRootLayoutComponent = null;
		@Nullable RootLayoutComponent mRootLayoutComponent = null;

		RemoteComposeState mRemoteComposeState = new RemoteComposeState();
		TimeVariables mTimeVariables = new TimeVariables();
		@NonNull TimeVariables mTimeVariables = new TimeVariables();
		// Semantic version of the document
		Version mVersion = new Version(0, 1, 0);
		@NonNull Version mVersion = new Version(0, 1, 0);

		String mContentDescription; // text description of the document (used for accessibility)

		@@ -72,6 +78,8 @@ public class CoreDocument {

		private final HashMap<Long, IntegerExpression> mIntegerExpressions = new HashMap<>();

		private HashSet<Component> mAppliedTouchOperations = new HashSet<>();

		private int mLastId = 1; // last component id when inflating the file

		public String getContentDescription() {
		@@ -272,6 +280,7 @@ public class CoreDocument {
		*
		* @return list of click areas in document coordinates
		*/
		@NonNull
		public Set<ClickAreaRepresentation> getClickAreas() {
		return mClickAreas;
		}
		@@ -281,6 +290,7 @@ public class CoreDocument {
		*
		* @return returns the root component if it exists, null otherwise
		*/
		@Nullable
		public RootLayoutComponent getRootLayoutComponent() {
		return mRootLayoutComponent;
		}
		@@ -298,6 +308,7 @@ public class CoreDocument {
		* @param id component id
		* @return the component if it exists, null otherwise
		*/
		@Nullable
		public Component getComponent(int id) {
		if (mRootLayoutComponent != null) {
		return mRootLayoutComponent.getComponent(id);
		@@ -310,6 +321,7 @@ public class CoreDocument {
		*
		* @return a standardized string representation of the component hierarchy
		*/
		@NonNull
		public String displayHierarchy() {
		StringSerializer serializer = new StringSerializer();
		for (Operation op : mOperations) {
		@@ -329,7 +341,8 @@ public class CoreDocument {
		* @param targetId the id of the value to update with the expression
		* @param context the current context
		*/
		public void evaluateIntExpression(long expressionId, int targetId, RemoteContext context) {
		public void evaluateIntExpression(
		long expressionId, int targetId, @NonNull RemoteContext context) {
		IntegerExpression expression = mIntegerExpressions.get(expressionId);
		if (expression != null) {
		int v = expression.evaluate(context);
		@@ -337,22 +350,46 @@ public class CoreDocument {
		}
		}

		// ============== Haptic support ==================
		public interface HapticEngine {
		void haptic(int type);
		}

		HapticEngine mHapticEngine;

		public void setHapticEngine(HapticEngine engine) {
		mHapticEngine = engine;
		}

		public void haptic(int type) {
		if (mHapticEngine != null) {
		mHapticEngine.haptic(type);
		}
		}

		// ============== Haptic support ==================

		public void appliedTouchOperation(Component operation) {
		mAppliedTouchOperations.add(operation);
		}

		/** Callback interface for host actions */
		public interface ActionCallback {
		// TODO: add payload support
		void onAction(String name);
		void onAction(String name, Object value);
		}

		HashSet<ActionCallback> mActionListeners = new HashSet<ActionCallback>();
		@NonNull HashSet<ActionCallback> mActionListeners = new HashSet<ActionCallback>();

		/**
		* Warn action listeners for the given named action
		*
		* @param name the action name
		* @param value a parameter to the action
		*/
		public void runNamedAction(String name) {
		public void runNamedAction(String name, Object value) {
		// TODO: we might add an interface to group all valid parameter types
		for (ActionCallback callback : mActionListeners) {
		callback.onAction(name);
		callback.onAction(name, value);
		}
		}

		@@ -374,8 +411,9 @@ public class CoreDocument {
		void click(int id, String metadata);
		}

		HashSet<ClickCallbacks> mClickListeners = new HashSet<>();
		HashSet<ClickAreaRepresentation> mClickAreas = new HashSet<>();
		@NonNull HashSet<ClickCallbacks> mClickListeners = new HashSet<>();
		@NonNull HashSet<TouchListener> mTouchListeners = new HashSet<>();
		@NonNull HashSet<ClickAreaRepresentation> mClickAreas = new HashSet<>();

		static class Version {
		public final int major;
		@@ -456,7 +494,7 @@ public class CoreDocument {
		}

		/** Load operations from the given buffer */
		public void initFromBuffer(RemoteComposeBuffer buffer) {
		public void initFromBuffer(@NonNull RemoteComposeBuffer buffer) {
		mOperations = new ArrayList<Operation>();
		buffer.inflateFromBuffer(mOperations);
		for (Operation op : mOperations) {
		@@ -484,12 +522,16 @@ public class CoreDocument {
		* @param operations flat list of operations
		* @return nested list of operations / components
		*/
		private ArrayList<Operation> inflateComponents(ArrayList<Operation> operations) {
		@NonNull
		private ArrayList<Operation> inflateComponents(@NonNull ArrayList<Operation> operations) {
		Component currentComponent = null;
		ArrayList<Component> components = new ArrayList<>();
		ArrayList<Operation> finalOperationsList = new ArrayList<>();
		ArrayList<Operation> ops = finalOperationsList;
		ClickModifierOperation currentClickModifier = null;
		TouchDownModifierOperation currentTouchDownModifier = null;
		TouchUpModifierOperation currentTouchUpModifier = null;
		TouchCancelModifierOperation currentTouchCancelModifier = null;
		LoopOperation currentLoop = null;

		mLastId = -1;
		@@ -519,10 +561,30 @@ public class CoreDocument {
		// TODO: refactor to add container <- component...
		currentClickModifier = (ClickModifierOperation) o;
		ops = currentClickModifier.getList();
		} else if (o instanceof ClickModifierEnd) {
		} else if (o instanceof TouchDownModifierOperation) {
		currentTouchDownModifier = (TouchDownModifierOperation) o;
		ops = currentTouchDownModifier.getList();
		} else if (o instanceof TouchUpModifierOperation) {
		currentTouchUpModifier = (TouchUpModifierOperation) o;
		ops = currentTouchUpModifier.getList();
		} else if (o instanceof TouchCancelModifierOperation) {
		currentTouchCancelModifier = (TouchCancelModifierOperation) o;
		ops = currentTouchCancelModifier.getList();
		} else if (o instanceof OperationsListEnd) {
		ops = currentComponent.getList();
		if (currentClickModifier != null) {
		ops.add(currentClickModifier);
		currentClickModifier = null;
		} else if (currentTouchDownModifier != null) {
		ops.add(currentTouchDownModifier);
		currentTouchDownModifier = null;
		} else if (currentTouchUpModifier != null) {
		ops.add(currentTouchUpModifier);
		currentTouchUpModifier = null;
		} else if (currentTouchCancelModifier != null) {
		ops.add(currentTouchCancelModifier);
		currentTouchCancelModifier = null;
		}
		} else if (o instanceof LoopOperation) {
		currentLoop = (LoopOperation) o;
		ops = currentLoop.getList();
		@@ -541,9 +603,9 @@ public class CoreDocument {
		return ops;
		}

		private HashMap<Integer, Component> mComponentMap = new HashMap<Integer, Component>();
		@NonNull private HashMap<Integer, Component> mComponentMap = new HashMap<Integer, Component>();

		private void registerVariables(RemoteContext context, ArrayList<Operation> list) {
		private void registerVariables(RemoteContext context, @NonNull ArrayList<Operation> list) {
		for (Operation op : list) {
		if (op instanceof VariableSupport) {
		((VariableSupport) op).updateVariables(context);
		@@ -578,7 +640,7 @@ public class CoreDocument {
		* Called when an initialization is needed, allowing the document to eg load resources / cache
		* them.
		*/
		public void initializeContext(RemoteContext context) {
		public void initializeContext(@NonNull RemoteContext context) {
		mRemoteComposeState.reset();
		mRemoteComposeState.setContext(context);
		mClickAreas.clear();
		@@ -650,6 +712,15 @@ public class CoreDocument {
		id, contentDescription, left, top, right, bottom, metadata));
		}

		/**
		* Called by commands to listen to touch events
		*
		* @param listener
		*/
		public void addTouchListener(TouchListener listener) {
		mTouchListeners.add(listener);
		}

		/**
		* Add a click listener. This will get called when a click is detected on the document
		*
		@@ -664,6 +735,7 @@ public class CoreDocument {
		*
		* @return set of click listeners
		*/
		@NonNull
		public HashSet<CoreDocument.ClickCallbacks> getClickListeners() {
		return mClickListeners;
		}
		@@ -700,12 +772,98 @@ public class CoreDocument {
		}

		/** Warn click listeners when a click area is activated */
		private void warnClickListeners(ClickAreaRepresentation clickArea) {
		private void warnClickListeners(@NonNull ClickAreaRepresentation clickArea) {
		for (ClickCallbacks listener : mClickListeners) {
		listener.click(clickArea.mId, clickArea.mMetadata);
		}
		}

		/**
		* Returns true if the document has touch listeners
		*
		* @return true if the document needs to react to touch events
		*/
		public boolean hasTouchListener() {
		boolean hasComponentsTouchListeners =
		mRootLayoutComponent != null && mRootLayoutComponent.hasTouchListeners();
		return hasComponentsTouchListeners \|\| !mTouchListeners.isEmpty();
		}

		// TODO support velocity estimate support, support regions
		/**
		* Support touch drag events on commands supporting touch
		*
		* @param x position of touch
		* @param y position of touch
		*/
		public boolean touchDrag(RemoteContext context, float x, float y) {
		context.loadFloat(RemoteContext.ID_TOUCH_POS_X, x);
		context.loadFloat(RemoteContext.ID_TOUCH_POS_Y, y);
		for (TouchListener clickArea : mTouchListeners) {
		clickArea.touchDrag(context, x, y);
		}
		if (!mTouchListeners.isEmpty()) {
		return true;
		}
		return false;
		}

		/**
		* Support touch down events on commands supporting touch
		*
		* @param x position of touch
		* @param y position of touch
		*/
		public void touchDown(RemoteContext context, float x, float y) {
		context.loadFloat(RemoteContext.ID_TOUCH_POS_X, x);
		context.loadFloat(RemoteContext.ID_TOUCH_POS_Y, y);
		for (TouchListener clickArea : mTouchListeners) {
		clickArea.touchDown(context, x, y);
		}
		if (mRootLayoutComponent != null) {
		mRootLayoutComponent.onTouchDown(context, this, x, y);
		}
		mRepaintNext = 1;
		}

		/**
		* Support touch up events on commands supporting touch
		*
		* @param x position of touch
		* @param y position of touch
		*/
		public void touchUp(RemoteContext context, float x, float y, float dx, float dy) {
		context.loadFloat(RemoteContext.ID_TOUCH_POS_X, x);
		context.loadFloat(RemoteContext.ID_TOUCH_POS_Y, y);
		for (TouchListener clickArea : mTouchListeners) {
		clickArea.touchUp(context, x, y, dx, dy);
		}
		if (mRootLayoutComponent != null) {
		for (Component component : mAppliedTouchOperations) {
		component.onTouchUp(context, this, x, y, true);
		}
		mAppliedTouchOperations.clear();
		}
		mRepaintNext = 1;
		}

		/**
		* Support touch cancel events on commands supporting touch
		*
		* @param x position of touch
		* @param y position of touch
		*/
		public void touchCancel(RemoteContext context, float x, float y, float dx, float dy) {
		if (mRootLayoutComponent != null) {
		for (Component component : mAppliedTouchOperations) {
		component.onTouchCancel(context, this, x, y, true);
		}
		mAppliedTouchOperations.clear();
		}
		mRepaintNext = 1;
		}

		@NonNull
		@Override
		public String toString() {
		StringBuilder builder = new StringBuilder();
		@@ -721,12 +879,22 @@ public class CoreDocument {
		*
		* @return array of named colors or null
		*/
		@Nullable
		public String[] getNamedColors() {
		return getNamedVariables(NamedVariable.COLOR_TYPE);
		}

		/**
		* Gets the names of all named Variables.
		*
		* @return array of named variables or null
		*/
		public String[] getNamedVariables(int type) {
		int count = 0;
		for (Operation op : mOperations) {
		if (op instanceof NamedVariable) {
		NamedVariable n = (NamedVariable) op;
		if (n.mVarType == NamedVariable.COLOR_TYPE) {
		if (n.mVarType == type) {
		count++;
		}
		}
		@@ -739,7 +907,7 @@ public class CoreDocument {
		for (Operation op : mOperations) {
		if (op instanceof NamedVariable) {
		NamedVariable n = (NamedVariable) op;
		if (n.mVarType == NamedVariable.COLOR_TYPE) {
		if (n.mVarType == type) {
		ret[i++] = n.mVarName;
		}
		}
		@@ -770,10 +938,9 @@ public class CoreDocument {
		* @param context the provided PaintContext
		* @param theme the theme we want to use for this document.
		*/
		public void paint(RemoteContext context, int theme) {
		public void paint(@NonNull RemoteContext context, int theme) {
		context.getPaintContext().clearNeedsRepaint();
		context.mMode = RemoteContext.ContextMode.UNSET;

		// current theme starts as UNSPECIFIED, until a Theme setter
		// operation gets executed and modify it.
		context.setTheme(Theme.UNSPECIFIED);
		@@ -807,6 +974,7 @@ public class CoreDocument {
		}
		// TODO -- this should be specifically about applying animation, not paint
		mRootLayoutComponent.paint(context.getPaintContext());
		context.mPaintContext.reset();
		// TODO -- should be able to remove this
		mRootLayoutComponent.updateVariables(context);
		if (DEBUG) {
		@@ -843,6 +1011,7 @@ public class CoreDocument {
		}
		}

		@NonNull
		public String[] getStats() {
		ArrayList<String> ret = new ArrayList<>();
		WireBuffer buffer = new WireBuffer();
		@@ -875,7 +1044,7 @@ public class CoreDocument {
		return ret.toArray(new String[0]);
		}

		private int sizeOfComponent(Operation com, WireBuffer tmp) {
		private int sizeOfComponent(@NonNull Operation com, @NonNull WireBuffer tmp) {
		tmp.reset(100);
		com.write(tmp);
		int size = tmp.getSize();
		@@ -883,7 +1052,8 @@ public class CoreDocument {
		return size;
		}

		private int addChildren(Component base, HashMap<String, int[]> map, WireBuffer tmp) {
		private int addChildren(
		@NonNull Component base, @NonNull HashMap<String, int[]> map, @NonNull WireBuffer tmp) {
		int count = base.mList.size();
		for (Operation mOperation : base.mList) {
		Class<? extends Operation> c = mOperation.getClass();
		@@ -903,6 +1073,7 @@ public class CoreDocument {
		return count;
		}

		@NonNull
		public String toNestedString() {
		StringBuilder ret = new StringBuilder();
		for (Operation mOperation : mOperations) {
		@@ -915,7 +1086,8 @@ public class CoreDocument {
		return ret.toString();
		}

		private void toNestedString(Component base, StringBuilder ret, String indent) {
		private void toNestedString(
		@NonNull Component base, @NonNull StringBuilder ret, String indent) {
		for (Operation mOperation : base.mList) {
		ret.append(mOperation.toString());
		ret.append("\n");

core/java/com/android/internal/widget/remotecompose/core/Operation.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		*/
		package com.android.internal.widget.remotecompose.core;

		import android.annotation.Nullable;

		/** Base interface for RemoteCompose operations */
		public interface Operation {

		@@ -29,5 +31,6 @@ public interface Operation {
		void apply(RemoteContext context);

		/** Debug utility to display an operation + indentation */
		@Nullable
		String deepToString(String indent);
		}

core/java/com/android/internal/widget/remotecompose/core/Operations.java

+34 −4

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		*/
		package com.android.internal.widget.remotecompose.core;

		import android.annotation.NonNull;

		import com.android.internal.widget.remotecompose.core.operations.BitmapData;
		import com.android.internal.widget.remotecompose.core.operations.ClickArea;
		import com.android.internal.widget.remotecompose.core.operations.ClipPath;
		@@ -65,15 +67,19 @@ import com.android.internal.widget.remotecompose.core.operations.TextLookupInt;
		import com.android.internal.widget.remotecompose.core.operations.TextMeasure;
		import com.android.internal.widget.remotecompose.core.operations.TextMerge;
		import com.android.internal.widget.remotecompose.core.operations.Theme;
		import com.android.internal.widget.remotecompose.core.operations.TouchExpression;
		import com.android.internal.widget.remotecompose.core.operations.layout.CanvasContent;
		import com.android.internal.widget.remotecompose.core.operations.layout.ClickModifierEnd;
		import com.android.internal.widget.remotecompose.core.operations.layout.ClickModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.ComponentEnd;
		import com.android.internal.widget.remotecompose.core.operations.layout.ComponentStart;
		import com.android.internal.widget.remotecompose.core.operations.layout.LayoutComponentContent;
		import com.android.internal.widget.remotecompose.core.operations.layout.LoopEnd;
		import com.android.internal.widget.remotecompose.core.operations.layout.LoopOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.OperationsListEnd;
		import com.android.internal.widget.remotecompose.core.operations.layout.RootLayoutComponent;
		import com.android.internal.widget.remotecompose.core.operations.layout.TouchCancelModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.TouchDownModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.TouchUpModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.animation.AnimationSpec;
		import com.android.internal.widget.remotecompose.core.operations.layout.managers.BoxLayout;
		import com.android.internal.widget.remotecompose.core.operations.layout.managers.CanvasLayout;
		@@ -85,15 +91,19 @@ import com.android.internal.widget.remotecompose.core.operations.layout.modifier
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.BorderModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.ClipRectModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.ComponentVisibilityOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.GraphicsLayerModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.HeightModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.HostActionOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.HostNamedActionOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.OffsetModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.PaddingModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.RoundedClipRectModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.ValueFloatChangeActionOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.ValueIntegerChangeActionOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.ValueIntegerExpressionChangeActionOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.ValueStringChangeActionOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.WidthModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.layout.modifiers.ZIndexModifierOperation;
		import com.android.internal.widget.remotecompose.core.operations.utilities.IntMap;
		import com.android.internal.widget.remotecompose.core.types.BooleanConstant;
		import com.android.internal.widget.remotecompose.core.types.IntegerConstant;
		@@ -165,6 +175,7 @@ public class Operations {
		public static final int DATA_MAP_LOOKUP = 154;
		public static final int TEXT_MEASURE = 155;
		public static final int TEXT_LENGTH = 156;
		public static final int TOUCH_EXPRESSION = 157;

		///////////////////////////////////////// ======================

		@@ -194,8 +205,16 @@ public class Operations {
		public static final int MODIFIER_ROUNDED_CLIP_RECT = 54;

		public static final int MODIFIER_CLICK = 59;
		public static final int MODIFIER_TOUCH_DOWN = 219;
		public static final int MODIFIER_TOUCH_UP = 220;
		public static final int MODIFIER_TOUCH_CANCEL = 225;

		public static final int OPERATIONS_LIST_END = 214;

		public static final int MODIFIER_OFFSET = 221;
		public static final int MODIFIER_ZINDEX = 223;
		public static final int MODIFIER_GRAPHICS_LAYER = 224;

		public static final int MODIFIER_CLICK_END = 214;
		public static final int LOOP_START = 215;
		public static final int LOOP_END = 216;

		@@ -206,12 +225,13 @@ public class Operations {
		public static final int VALUE_INTEGER_CHANGE_ACTION = 212;
		public static final int VALUE_STRING_CHANGE_ACTION = 213;
		public static final int VALUE_INTEGER_EXPRESSION_CHANGE_ACTION = 218;
		public static final int VALUE_FLOAT_CHANGE_ACTION = 222;

		public static final int ANIMATION_SPEC = 14;

		public static final int COMPONENT_VALUE = 150;

		public static UniqueIntMap<CompanionOperation> map = new UniqueIntMap<>();
		@NonNull public static UniqueIntMap<CompanionOperation> map = new UniqueIntMap<>();

		static class UniqueIntMap<T> extends IntMap<T> {
		@Override
		@@ -289,8 +309,16 @@ public class Operations {
		map.put(MODIFIER_ROUNDED_CLIP_RECT, RoundedClipRectModifierOperation::read);
		map.put(MODIFIER_CLIP_RECT, ClipRectModifierOperation::read);
		map.put(MODIFIER_CLICK, ClickModifierOperation::read);
		map.put(MODIFIER_CLICK_END, ClickModifierEnd::read);
		map.put(MODIFIER_TOUCH_DOWN, TouchDownModifierOperation::read);
		map.put(MODIFIER_TOUCH_UP, TouchUpModifierOperation::read);
		map.put(MODIFIER_TOUCH_CANCEL, TouchCancelModifierOperation::read);
		map.put(MODIFIER_VISIBILITY, ComponentVisibilityOperation::read);
		map.put(MODIFIER_OFFSET, OffsetModifierOperation::read);
		map.put(MODIFIER_ZINDEX, ZIndexModifierOperation::read);
		map.put(MODIFIER_GRAPHICS_LAYER, GraphicsLayerModifierOperation::read);

		map.put(OPERATIONS_LIST_END, OperationsListEnd::read);

		map.put(HOST_ACTION, HostActionOperation::read);
		map.put(HOST_NAMED_ACTION, HostNamedActionOperation::read);
		map.put(VALUE_INTEGER_CHANGE_ACTION, ValueIntegerChangeActionOperation::read);
		@@ -298,6 +326,7 @@ public class Operations {
		VALUE_INTEGER_EXPRESSION_CHANGE_ACTION,
		ValueIntegerExpressionChangeActionOperation::read);
		map.put(VALUE_STRING_CHANGE_ACTION, ValueStringChangeActionOperation::read);
		map.put(VALUE_FLOAT_CHANGE_ACTION, ValueFloatChangeActionOperation::read);

		map.put(LAYOUT_ROOT, RootLayoutComponent::read);
		map.put(LAYOUT_CONTENT, LayoutComponentContent::read);
		@@ -315,5 +344,6 @@ public class Operations {
		map.put(DATA_MAP_LOOKUP, DataMapLookup::read);
		map.put(TEXT_MEASURE, TextMeasure::read);
		map.put(TEXT_LENGTH, TextLength::read);
		map.put(TOUCH_EXPRESSION, TouchExpression::read);
		}
		}

core/java/com/android/internal/widget/remotecompose/core/PaintContext.java

+20 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/java/com/android/internal/widget/remotecompose/core/PaintOperation.java

+4 −1

File changed.

Preview size limit exceeded, changes collapsed.