sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename host_activity.xml to avoid manifest merge conflicts.

Browse source 
PiperOrigin-RevId: 250672752
This commit is contained in:
tonihei 2019-05-30 13:40:49 +01:00 committed by Toni
parent fd1179aaa1
commit 126aad5882
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
View file

@ -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);

0
testutils/src/main/res/layout/host_activity.xml → testutils/src/main/res/layout/exo_testutils_host_activity.xml
View file