Commit 126aad58 by tonihei Committed by Toni

Rename host_activity.xml to avoid manifest merge conflicts.

PiperOrigin-RevId: 250672752
parent fd1179aa
...@@ -166,7 +166,8 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba ...@@ -166,7 +166,8 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE); requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(getResources().getIdentifier("host_activity", "layout", getPackageName())); setContentView(
getResources().getIdentifier("exo_testutils_host_activity", "layout", getPackageName()));
surfaceView = findViewById( surfaceView = findViewById(
getResources().getIdentifier("surface_view", "id", getPackageName())); getResources().getIdentifier("surface_view", "id", getPackageName()));
surfaceView.getHolder().addCallback(this); surfaceView.getHolder().addCallback(this);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment