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

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

Merge "Fix SurfaceControlViewHostTest activities for edge-to-edge" into main

parents fbab562e 98dd194d

tests/SurfaceControlViewHostTest/src/com/android/test/viewembed/SurfaceControlViewHostSyncTest.java

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ public class SurfaceControlViewHostSyncTest extends Activity implements SurfaceH 
        content.addView(enableSyncButton,

                new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,

                        ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.RIGHT | Gravity.BOTTOM));

        content.setFitsSystemWindows(true);

        setContentView(content);



        mSv.setZOrderOnTop(false);

tests/SurfaceControlViewHostTest/src/com/android/test/viewembed/SurfaceControlViewHostTest.java

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public class SurfaceControlViewHostTest extends Activity implements SurfaceHolde 


    protected void onCreate(Bundle savedInstanceState) {

        FrameLayout content = new FrameLayout(this);

        content.setFitsSystemWindows(true);

        super.onCreate(savedInstanceState);

        mView = new SurfaceView(this);

        content.addView(mView, new FrameLayout.LayoutParams(

tests/SurfaceControlViewHostTest/src/com/android/test/viewembed/SurfaceInputTestActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ public class SurfaceInputTestActivity extends Activity { 
    protected void onCreate(@Nullable Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        LinearLayout content = new LinearLayout(this);

        content.setFitsSystemWindows(true);

        mLocalSurfaceView = new SurfaceView(this);

        content.addView(mLocalSurfaceView, new LinearLayout.LayoutParams(

                500, 500, Gravity.CENTER_HORIZONTAL | Gravity.TOP));