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

Commit 4c51d153 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update to ToT RemoteCompose" into main

parents 559467b3 f4bb8046

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ public class CoreDocument { 




    // We also keep a more fine-grained BUILD number, exposed as

    // We also keep a more fine-grained BUILD number, exposed as

    // ID_API_LEVEL = DOCUMENT_API_LEVEL + BUILD

    // ID_API_LEVEL = DOCUMENT_API_LEVEL + BUILD

    static final float BUILD = 0.1f;

    static final float BUILD = 0.2f;





    @NonNull ArrayList<Operation> mOperations = new ArrayList<>();

    @NonNull ArrayList<Operation> mOperations = new ArrayList<>();
@@ -1058,7 +1058,7 @@ public class CoreDocument { 
     * @param theme the theme we want to use for this document.

     * @param theme the theme we want to use for this document.

     */

     */

    public void paint(@NonNull RemoteContext context, int theme) {

    public void paint(@NonNull RemoteContext context, int theme) {

        context.getLastOpCount();

        context.clearLastOpCount();

        context.getPaintContext().clearNeedsRepaint();

        context.getPaintContext().clearNeedsRepaint();

        context.loadFloat(RemoteContext.ID_DENSITY, context.getDensity());

        context.loadFloat(RemoteContext.ID_DENSITY, context.getDensity());

        context.mMode = RemoteContext.ContextMode.UNSET;

        context.mMode = RemoteContext.ContextMode.UNSET;

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -528,6 +528,7 @@ public class RemoteComposeState implements CollectionsAccess { 




    public void setContext(@NonNull RemoteContext context) {

    public void setContext(@NonNull RemoteContext context) {

        mRemoteContext = context;

        mRemoteContext = context;

        mRemoteContext.clearLastOpCount();

    }

    }





    public void updateObject(int id, @NonNull Object value) {

    public void updateObject(int id, @NonNull Object value) {

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -743,4 +743,9 @@ public abstract class RemoteContext { 
        mOpCount = 0;

        mOpCount = 0;

        return count;

        return count;

    }

    }



    /** Explicitly clear the operation counter */

    public void clearLastOpCount() {

        mOpCount = 0;

    }

}
 
}