Rename host_activity.xml to avoid manifest merge conflicts.

PiperOrigin-RevId: 250672752
google · May 30, 2019 · 126aad5 · 126aad5
1 parent fd1179a
commit 126aad5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
@@ -166,7 +166,8 @@ public void runTest(
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     requestWindowFeature(Window.FEATURE_NO_TITLE);
-    setContentView(getResources().getIdentifier("host_activity", "layout", getPackageName()));
+    setContentView(
+        getResources().getIdentifier("exo_testutils_host_activity", "layout", getPackageName()));
     surfaceView = findViewById(
         getResources().getIdentifier("surface_view", "id", getPackageName()));
     surfaceView.getHolder().addCallback(this);

diff --git a/...ils/src/main/res/layout/host_activity.xml → ...es/layout/exo_testutils_host_activity.xml b/...ils/src/main/res/layout/host_activity.xml → ...es/layout/exo_testutils_host_activity.xml