Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
126aad58
authored
May 30, 2019
by
tonihei
Committed by
Toni
May 30, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Rename host_activity.xml to avoid manifest merge conflicts.
PiperOrigin-RevId: 250672752
parent
fd1179aa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletions
testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
testutils/src/main/res/layout/host_activity.xml → testutils/src/main/res/layout/exo_testutils_host_activity.xml
testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
View file @
126aad58
...
@@ -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
);
...
...
testutils/src/main/res/layout/host_activity.xml
→
testutils/src/main/res/layout/
exo_testutils_
host_activity.xml
View file @
126aad58
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment