Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC-Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
aa3072ec
Commit
aa3072ec
authored
May 20, 2015
by
Geoffrey Métais
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename exit method
exit sounds like java System.exit()
parent
c94967db
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
...d/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+6
-6
No files found.
vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
View file @
aa3072ec
...
...
@@ -893,7 +893,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
mBattery
.
setText
(
String
.
format
(
"%d%%"
,
batteryLevel
));
}
else
if
(
action
.
equalsIgnoreCase
(
VLCApplication
.
SLEEP_INTENT
))
{
exit
();
exit
OK
();
}
}
};
...
...
@@ -909,7 +909,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
finish
();
}
private
void
exit
()
{
private
void
exit
OK
()
{
exit
(
RESULT_OK
);
}
...
...
@@ -996,7 +996,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
}
else
if
(
BuildConfig
.
tv
&&
mShowing
&&
!
mIsLocked
)
{
hideOverlay
(
true
);
}
else
exit
();
exit
OK
();
}
@Override
...
...
@@ -1053,7 +1053,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
return
true
;
case
KeyEvent
.
KEYCODE_S
:
case
KeyEvent
.
KEYCODE_MEDIA_STOP
:
exit
();
exit
OK
();
return
true
;
case
KeyEvent
.
KEYCODE_DPAD_UP
:
case
KeyEvent
.
KEYCODE_DPAD_DOWN
:
...
...
@@ -1609,7 +1609,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
}
else
{
/* Exit player when reaching the end */
mEndReached
=
true
;
exit
();
exit
OK
();
}
}
...
...
@@ -1696,7 +1696,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
}
startActivity
(
i
);
}
exit
();
exit
OK
();
}
@TargetApi
(
Build
.
VERSION_CODES
.
JELLY_BEAN_MR1
)
...
...
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