commit 6ac7d86c565ba08e4afdeca1e4f172624134f29e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Dec 04 02:19:55 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 04 02:19:55 2024 +0000
tree b542317583c83ec0e3f883d0c3b22b64bde83f93
parent 4a93c7cbcf954dad0e0b7ec8a0b1df262392b106
parent d1ac45986f994cd5f9cdcfd7fd382333c475fc60

Merge "Update to ToT RemoteCompose" into main

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

diff --git a/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java b/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java
index da880e1..1e9ba78 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java
@@ -697,6 +697,7 @@
                     }
                 }
             }
+            op.markNotDirty();
             op.apply(context);
         }
     }

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

diff --git a/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java b/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java
index 11e58ba..5c3df7e 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java
@@ -333,6 +333,7 @@
     public void overrideColor(int id, int color) {
         mColorOverride[id] = true;
         mColorMap.put(id, color);
+        updateListeners(id);
     }
 
     /** Clear the color Overrides */

core/java/com/android/internal/widget/remotecompose/core/operations/ClickArea.java

diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/ClickArea.java b/core/java/com/android/internal/widget/remotecompose/core/operations/ClickArea.java
index 29124d0..bb112d1 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/ClickArea.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/ClickArea.java
@@ -132,9 +132,6 @@
 
     @Override
     public void apply(@NonNull RemoteContext context) {
-        if (context.getMode() != RemoteContext.ContextMode.DATA) {
-            return;
-        }
         context.addClickArea(
                 mId, mContentDescription, mOutLeft, mOutTop, mOutRight, mOutBottom, mMetadata);
     }

core/java/com/android/internal/widget/remotecompose/core/operations/Theme.java

diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/Theme.java b/core/java/com/android/internal/widget/remotecompose/core/operations/Theme.java
index 6c9105d..e9aae1e 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/operations/Theme.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/operations/Theme.java
@@ -64,6 +64,7 @@
     @Override
     public void apply(@NonNull RemoteContext context) {
         context.setTheme(mTheme);
+        markDirty();
     }
 
     @NonNull