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
3d3ac623
authored
Jun 21, 2021
by
olly
Committed by
Oliver Woodman
Jun 21, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Specify a root when inflating child views
#minor-release PiperOrigin-RevId: 380655806
parent
6f686be7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
View file @
3d3ac623
...
@@ -675,7 +675,8 @@ public class StyledPlayerControlView extends FrameLayout {
...
@@ -675,7 +675,8 @@ public class StyledPlayerControlView extends FrameLayout {
settingsWindowMargin
=
resources
.
getDimensionPixelSize
(
R
.
dimen
.
exo_settings_offset
);
settingsWindowMargin
=
resources
.
getDimensionPixelSize
(
R
.
dimen
.
exo_settings_offset
);
settingsView
=
settingsView
=
(
RecyclerView
)
(
RecyclerView
)
LayoutInflater
.
from
(
context
).
inflate
(
R
.
layout
.
exo_styled_settings_list
,
null
);
LayoutInflater
.
from
(
context
)
.
inflate
(
R
.
layout
.
exo_styled_settings_list
,
/* root= */
null
);
settingsView
.
setAdapter
(
settingsAdapter
);
settingsView
.
setAdapter
(
settingsAdapter
);
settingsView
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
settingsView
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
settingsWindow
=
settingsWindow
=
...
@@ -1880,9 +1881,10 @@ public class StyledPlayerControlView extends FrameLayout {
...
@@ -1880,9 +1881,10 @@ public class StyledPlayerControlView extends FrameLayout {
}
}
@Override
@Override
public
SettingViewHolder
onCreateViewHolder
(
ViewGroup
viewGroup
,
int
viewType
)
{
public
SettingViewHolder
onCreateViewHolder
(
ViewGroup
parent
,
int
viewType
)
{
View
v
=
View
v
=
LayoutInflater
.
from
(
getContext
()).
inflate
(
R
.
layout
.
exo_styled_settings_list_item
,
null
);
LayoutInflater
.
from
(
getContext
())
.
inflate
(
R
.
layout
.
exo_styled_settings_list_item
,
parent
,
/* attachToRoot= */
false
);
return
new
SettingViewHolder
(
v
);
return
new
SettingViewHolder
(
v
);
}
}
...
@@ -1970,7 +1972,8 @@ public class StyledPlayerControlView extends FrameLayout {
...
@@ -1970,7 +1972,8 @@ public class StyledPlayerControlView extends FrameLayout {
public
SubSettingViewHolder
onCreateViewHolder
(
ViewGroup
parent
,
int
viewType
)
{
public
SubSettingViewHolder
onCreateViewHolder
(
ViewGroup
parent
,
int
viewType
)
{
View
v
=
View
v
=
LayoutInflater
.
from
(
getContext
())
LayoutInflater
.
from
(
getContext
())
.
inflate
(
R
.
layout
.
exo_styled_sub_settings_list_item
,
null
);
.
inflate
(
R
.
layout
.
exo_styled_sub_settings_list_item
,
parent
,
/* attachToRoot= */
false
);
return
new
SubSettingViewHolder
(
v
);
return
new
SubSettingViewHolder
(
v
);
}
}
...
@@ -2184,7 +2187,8 @@ public class StyledPlayerControlView extends FrameLayout {
...
@@ -2184,7 +2187,8 @@ public class StyledPlayerControlView extends FrameLayout {
public
SubSettingViewHolder
onCreateViewHolder
(
ViewGroup
parent
,
int
viewType
)
{
public
SubSettingViewHolder
onCreateViewHolder
(
ViewGroup
parent
,
int
viewType
)
{
View
v
=
View
v
=
LayoutInflater
.
from
(
getContext
())
LayoutInflater
.
from
(
getContext
())
.
inflate
(
R
.
layout
.
exo_styled_sub_settings_list_item
,
null
);
.
inflate
(
R
.
layout
.
exo_styled_sub_settings_list_item
,
parent
,
/* attachToRoot= */
false
);
return
new
SubSettingViewHolder
(
v
);
return
new
SubSettingViewHolder
(
v
);
}
}
...
...
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