Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Handle SurfaceView in a VirtualDisplay #33599

Merged
fluttergithubbot merged 25 commits into from
Jun 23, 2022
Merged

Handle SurfaceView in a VirtualDisplay #33599

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0832efc
Handle SurfaceView and TextureView in a VirtualDisplay
May 24, 2022
e2b2b94
refactor
May 24, 2022
e2e2341
Fix licenses
May 25, 2022
a8675ec
Add logs
May 26, 2022
9d30502
comment
May 26, 2022
6981201
fix
May 26, 2022
b8e49a0
use info
May 26, 2022
583b597
remove nullable context
May 26, 2022
dde18d7
document code
Jun 15, 2022
7f87be7
fixes
Jun 16, 2022
5e924ab
fix test
Jun 16, 2022
7cb2919
fallback to VD if API level < 23
Jun 17, 2022
42adbc4
revert last pieces
Jun 18, 2022
cf3b220
add integration test
Jun 18, 2022
225f943
clean up
Jun 18, 2022
58e54df
add missing view_type
Jun 18, 2022
cffe771
revert
Jun 18, 2022
33877fa
fixes
Jun 19, 2022
e44e6cd
talkback issue
Jun 21, 2022
8f821f6
don't include TextureView since it breaks a11y in google maps
Jun 21, 2022
1cde9af
integration test (rotate activity + invalidate after frame)
Jun 22, 2022
7b4708a
feedback
Jun 22, 2022
f0d1029
dispose bug
Jun 22, 2022
110bdb5
fix comment line, so it fits in a line after formatting
Jun 22, 2022
5a2c81b
handle clamp
Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
integration test (rotate activity + invalidate after frame)
  • Loading branch information
Emmanuel Garcia committed Jun 22, 2022
commit 1cde9af05dbe3cdc55dd5c4d0c7862883714862d
5 changes: 4 additions & 1 deletion ..._app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformTextureUiTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package dev.flutter.scenariosui;

import android.content.Intent;
import android.content.pm.ActivityInfo;
import androidx.annotation.NonNull;
import androidx.test.filters.LargeTest;
import androidx.test.rule.ActivityTestRule;
Expand Down Expand Up @@ -96,7 +97,9 @@ public void testPlatformViewOpacity() throws Exception {
@Test
public void testPlatformViewRotate() throws Exception {
intent.putExtra("scenario_name", "platform_view_rotate");
ScreenshotUtil.capture(activityRule.launchActivity(intent), goldName("testPlatformViewRotate"));
PlatformViewsActivity activity = activityRule.launchActivity(intent);
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
ScreenshotUtil.capture(activity, goldName("testPlatformViewRotate"));
}

@Test
Expand Down
5 changes: 4 additions & 1 deletion ...rio_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewUiTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package dev.flutter.scenariosui;

import android.content.Intent;
import android.content.pm.ActivityInfo;
import androidx.annotation.NonNull;
import androidx.test.filters.LargeTest;
import androidx.test.rule.ActivityTestRule;
Expand Down Expand Up @@ -96,7 +97,9 @@ public void testPlatformViewOpacity() throws Exception {
@Test
public void testPlatformViewRotate() throws Exception {
intent.putExtra("scenario_name", "platform_view_rotate");
ScreenshotUtil.capture(activityRule.launchActivity(intent), goldName("testPlatformViewRotate"));
PlatformViewsActivity activity = activityRule.launchActivity(intent);
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
ScreenshotUtil.capture(activity, goldName("testPlatformViewRotate"));
}

@Test
Expand Down
5 changes: 4 additions & 1 deletion ...d/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithSurfaceViewUiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package dev.flutter.scenariosui;

import android.content.Intent;
import android.content.pm.ActivityInfo;
import androidx.annotation.NonNull;
import androidx.test.filters.LargeTest;
import androidx.test.rule.ActivityTestRule;
Expand Down Expand Up @@ -96,7 +97,9 @@ public void testPlatformViewOpacity() throws Exception {
@Test
public void testPlatformViewRotate() throws Exception {
intent.putExtra("scenario_name", "platform_view_rotate");
ScreenshotUtil.capture(activityRule.launchActivity(intent), goldName("testPlatformViewRotate"));
PlatformViewsActivity activity = activityRule.launchActivity(intent);
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
ScreenshotUtil.capture(activity, goldName("testPlatformViewRotate"));
}

@Test
Expand Down
5 changes: 4 additions & 1 deletion ...d/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithTextureViewUiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package dev.flutter.scenariosui;

import android.content.Intent;
import android.content.pm.ActivityInfo;
import androidx.annotation.NonNull;
import androidx.test.filters.LargeTest;
import androidx.test.rule.ActivityTestRule;
Expand Down Expand Up @@ -94,7 +95,9 @@ public void testPlatformViewOpacity() throws Exception {
@Test
public void testPlatformViewRotate() throws Exception {
intent.putExtra("scenario_name", "platform_view_rotate");
ScreenshotUtil.capture(activityRule.launchActivity(intent), goldName("testPlatformViewRotate"));
PlatformViewsActivity activity = activityRule.launchActivity(intent);
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
ScreenshotUtil.capture(activity, goldName("testPlatformViewRotate"));
}

@Test
Expand Down
11 changes: 10 additions & 1 deletion ...nario_app/android/app/src/main/java/dev/flutter/scenarios/TexturePlatformViewFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.SurfaceTexture;
import android.view.Choreographer;
import android.view.TextureView;
import android.view.View;
import androidx.annotation.NonNull;
Expand Down Expand Up @@ -70,7 +71,15 @@ public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int hei
paint.setColor(Color.GREEN);
canvas.drawCircle(canvas.getWidth() / 2, canvas.getHeight() / 2, 20, paint);
textureView.unlockCanvasAndPost(canvas);
textureView.invalidate();
Choreographer.getInstance()
.postFrameCallbackDelayed(
new Choreographer.FrameCallback() {
@Override
public void doFrame(long frameTimeNanos) {
textureView.invalidate();
}
},
500);
}

@Override
Expand Down