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
af6baaed
authored
May 01, 2020
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge pull request #7304 from AChep:patch-1
PiperOrigin-RevId: 309395364
parents
36b43780
dfde3df2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
6 deletions
library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
View file @
af6baaed
...
@@ -196,7 +196,6 @@ public class DefaultTimeBar extends View implements TimeBar {
...
@@ -196,7 +196,6 @@ public class DefaultTimeBar extends View implements TimeBar {
private
final
Formatter
formatter
;
private
final
Formatter
formatter
;
private
final
Runnable
stopScrubbingRunnable
;
private
final
Runnable
stopScrubbingRunnable
;
private
final
CopyOnWriteArraySet
<
OnScrubListener
>
listeners
;
private
final
CopyOnWriteArraySet
<
OnScrubListener
>
listeners
;
private
final
int
[]
locationOnScreen
;
private
final
Point
touchPosition
;
private
final
Point
touchPosition
;
private
final
float
density
;
private
final
float
density
;
...
@@ -248,7 +247,6 @@ public class DefaultTimeBar extends View implements TimeBar {
...
@@ -248,7 +247,6 @@ public class DefaultTimeBar extends View implements TimeBar {
scrubberPaint
=
new
Paint
();
scrubberPaint
=
new
Paint
();
scrubberPaint
.
setAntiAlias
(
true
);
scrubberPaint
.
setAntiAlias
(
true
);
listeners
=
new
CopyOnWriteArraySet
<>();
listeners
=
new
CopyOnWriteArraySet
<>();
locationOnScreen
=
new
int
[
2
];
touchPosition
=
new
Point
();
touchPosition
=
new
Point
();
// Calculate the dimensions and paints for drawn elements.
// Calculate the dimensions and paints for drawn elements.
...
@@ -798,10 +796,7 @@ public class DefaultTimeBar extends View implements TimeBar {
...
@@ -798,10 +796,7 @@ public class DefaultTimeBar extends View implements TimeBar {
}
}
private
Point
resolveRelativeTouchPosition
(
MotionEvent
motionEvent
)
{
private
Point
resolveRelativeTouchPosition
(
MotionEvent
motionEvent
)
{
getLocationOnScreen
(
locationOnScreen
);
touchPosition
.
set
((
int
)
motionEvent
.
getX
(),
(
int
)
motionEvent
.
getY
());
touchPosition
.
set
(
((
int
)
motionEvent
.
getRawX
())
-
locationOnScreen
[
0
],
((
int
)
motionEvent
.
getRawY
())
-
locationOnScreen
[
1
]);
return
touchPosition
;
return
touchPosition
;
}
}
...
...
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