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
e92667ba
authored
Nov 13, 2017
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Only set shutter color if attr is declared
parent
99d0a7a3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
library/ui/src/main/res/values/attrs.xml
library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
View file @
e92667ba
...
...
@@ -83,12 +83,6 @@ import java.util.List;
* <li>Default: {@code true}</li>
* </ul>
* </li>
* <li><b>{@code shutter_background_color}</b> - The background color of the {@code exo_shutter} view.
* <ul>
* <li>Corresponding method: {@link #setShutterBackgroundColor(int)}</li>
* <li>Default: {@code 0}</li>
* </ul>
* </li>
* <li><b>{@code hide_on_touch}</b> - Whether the playback controls are hidden by touch events.
* <ul>
* <li>Corresponding method: {@link #setControllerHideOnTouch(boolean)}</li>
...
...
@@ -119,6 +113,13 @@ import java.util.List;
* <li>Default: {@code surface_view}</li>
* </ul>
* </li>
* <li><b>{@code shutter_background_color}</b> - The background color of the {@code exo_shutter}
* view.
* <ul>
* <li>Corresponding method: {@link #setShutterBackgroundColor(int)}</li>
* <li>Default: {@code unset}</li>
* </ul>
* </li>
* <li><b>{@code player_layout_id}</b> - Specifies the id of the layout to be inflated. See below
* for more details.
* <ul>
...
...
@@ -255,6 +256,7 @@ public final class SimpleExoPlayerView extends FrameLayout {
return
;
}
boolean
shutterColorSet
=
false
;
int
shutterColor
=
0
;
int
playerLayoutId
=
R
.
layout
.
exo_simple_player_view
;
boolean
useArtwork
=
true
;
...
...
@@ -269,7 +271,9 @@ public final class SimpleExoPlayerView extends FrameLayout {
TypedArray
a
=
context
.
getTheme
().
obtainStyledAttributes
(
attrs
,
R
.
styleable
.
SimpleExoPlayerView
,
0
,
0
);
try
{
shutterColor
=
a
.
getColor
(
R
.
styleable
.
SimpleExoPlayerView_shutter_background_color
,
shutterColor
);
shutterColorSet
=
a
.
hasValue
(
R
.
styleable
.
SimpleExoPlayerView_shutter_background_color
);
shutterColor
=
a
.
getColor
(
R
.
styleable
.
SimpleExoPlayerView_shutter_background_color
,
shutterColor
);
playerLayoutId
=
a
.
getResourceId
(
R
.
styleable
.
SimpleExoPlayerView_player_layout_id
,
playerLayoutId
);
useArtwork
=
a
.
getBoolean
(
R
.
styleable
.
SimpleExoPlayerView_use_artwork
,
useArtwork
);
...
...
@@ -301,7 +305,7 @@ public final class SimpleExoPlayerView extends FrameLayout {
// Shutter view.
shutterView
=
findViewById
(
R
.
id
.
exo_shutter
);
if
(
shutterView
!=
null
)
{
if
(
shutterView
!=
null
&&
shutterColorSet
)
{
shutterView
.
setBackgroundColor
(
shutterColor
);
}
...
...
@@ -527,7 +531,7 @@ public final class SimpleExoPlayerView extends FrameLayout {
/**
* Sets the background color of the {@code exo_shutter} view.
*
* @param color
A resolved color (not a resource ID) for the background of the shutter view
.
* @param color
The background color
.
*/
public
void
setShutterBackgroundColor
(
int
color
)
{
if
(
shutterView
!=
null
)
{
...
...
library/ui/src/main/res/values/attrs.xml
View file @
e92667ba
...
...
@@ -43,7 +43,7 @@
<declare-styleable
name=
"SimpleExoPlayerView"
>
<attr
name=
"use_artwork"
format=
"boolean"
/>
<attr
name=
"shutter_background_color"
format=
"color"
/>
<attr
name=
"shutter_background_color"
format=
"color"
/>
<attr
name=
"default_artwork"
format=
"reference"
/>
<attr
name=
"use_controller"
format=
"boolean"
/>
<attr
name=
"hide_on_touch"
format=
"boolean"
/>
...
...
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