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

Commit 24c0311c authored by Merissa Mitchell's avatar Merissa Mitchell Committed by Android (Google) Code Review
Browse files

Merge "[WindowDecor] Force set layoutDirection in ReusableWindowDecorViewHost" into main

parents aa0a4ab8 df3fc379

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/DefaultWindowDecorViewHost.kt

+1 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ class DefaultWindowDecorViewHost( 
        onDrawTransaction: SurfaceControl.Transaction?,

        onDrawTransaction: SurfaceControl.Transaction?,

    ) {

    ) {

        Trace.beginSection("DefaultWindowDecorViewHost#updateViewHost")

        Trace.beginSection("DefaultWindowDecorViewHost#updateViewHost")

        view.layoutDirection = configuration.layoutDirection

        viewHostAdapter.prepareViewHost(configuration, touchableRegion)

        viewHostAdapter.prepareViewHost(configuration, touchableRegion)

        onDrawTransaction?.let { viewHostAdapter.applyTransactionOnDraw(it) }

        onDrawTransaction?.let { viewHostAdapter.applyTransactionOnDraw(it) }

        viewHostAdapter.updateView(view, attrs)

        viewHostAdapter.updateView(view, attrs)

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/ReusableWindowDecorViewHost.kt

+1 −0
Original line number Original line Diff line number Diff line
@@ -142,6 +142,7 @@ class ReusableWindowDecorViewHost( 
        onDrawTransaction: SurfaceControl.Transaction?,

        onDrawTransaction: SurfaceControl.Transaction?,

    ) {

    ) {

        Trace.beginSection("ReusableWindowDecorViewHost#updateViewHost")

        Trace.beginSection("ReusableWindowDecorViewHost#updateViewHost")

        rootView.layoutDirection = configuration.layoutDirection

        viewHostAdapter.prepareViewHost(configuration, touchableRegion)

        viewHostAdapter.prepareViewHost(configuration, touchableRegion)

        onDrawTransaction?.let { viewHostAdapter.applyTransactionOnDraw(it) }

        onDrawTransaction?.let { viewHostAdapter.applyTransactionOnDraw(it) }

        when {

        when {