Skip to content

GitLab

Commit 49e03fa8 authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files
Options

Fix presentation mode

parent ebc51ff8
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 7 deletions
vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
View file @ 49e03fa8
...@@ -1250,7 +1250,8 @@ public class VideoPlayerActivity extends ActionBarActivity implements IVideoPlay ...@@ -1250,7 +1250,8 @@ public class VideoPlayerActivity extends ActionBarActivity implements IVideoPlay
* @param duration * @param duration
*/ */
private void showInfo(String text, int duration) { private void showInfo(String text, int duration) {
mVerticalBar.setVisibility(View.INVISIBLE); if (mPresentation == null)
mVerticalBar.setVisibility(View.INVISIBLE);
mInfo.setVisibility(View.VISIBLE); mInfo.setVisibility(View.VISIBLE);
mInfo.setText(text); mInfo.setText(text);
mHandler.removeMessages(FADE_OUT_INFO); mHandler.removeMessages(FADE_OUT_INFO);
...@@ -1258,7 +1259,8 @@ public class VideoPlayerActivity extends ActionBarActivity implements IVideoPlay ...@@ -1258,7 +1259,8 @@ public class VideoPlayerActivity extends ActionBarActivity implements IVideoPlay
} }
private void showInfo(int textid, int duration) { private void showInfo(int textid, int duration) {
mVerticalBar.setVisibility(View.INVISIBLE); if (mPresentation == null)
mVerticalBar.setVisibility(View.INVISIBLE);
mInfo.setVisibility(View.VISIBLE); mInfo.setVisibility(View.VISIBLE);
mInfo.setText(textid); mInfo.setText(textid);
mHandler.removeMessages(FADE_OUT_INFO); mHandler.removeMessages(FADE_OUT_INFO);
...@@ -1270,7 +1272,8 @@ public class VideoPlayerActivity extends ActionBarActivity implements IVideoPlay ...@@ -1270,7 +1272,8 @@ public class VideoPlayerActivity extends ActionBarActivity implements IVideoPlay
* @param text * @param text
*/ */
private void showInfo(String text) { private void showInfo(String text) {
mVerticalBar.setVisibility(View.INVISIBLE); if (mPresentation == null)
mVerticalBar.setVisibility(View.INVISIBLE);
mHandler.removeMessages(FADE_OUT_INFO); mHandler.removeMessages(FADE_OUT_INFO);
mInfo.setVisibility(View.VISIBLE); mInfo.setVisibility(View.VISIBLE);
mInfo.setText(text); mInfo.setText(text);
...@@ -1298,10 +1301,12 @@ public class VideoPlayerActivity extends ActionBarActivity implements IVideoPlay ...@@ -1298,10 +1301,12 @@ public class VideoPlayerActivity extends ActionBarActivity implements IVideoPlay
VideoPlayerActivity.this, android.R.anim.fade_out)); VideoPlayerActivity.this, android.R.anim.fade_out));
mInfo.setVisibility(View.INVISIBLE); mInfo.setVisibility(View.INVISIBLE);
if (mVerticalBar.getVisibility() == View.VISIBLE) if (mPresentation == null) {
mVerticalBar.startAnimation(AnimationUtils.loadAnimation( if (mVerticalBar.getVisibility() == View.VISIBLE)
VideoPlayerActivity.this, android.R.anim.fade_out)); mVerticalBar.startAnimation(AnimationUtils.loadAnimation(
mVerticalBar.setVisibility(View.INVISIBLE); VideoPlayerActivity.this, android.R.anim.fade_out));
mVerticalBar.setVisibility(View.INVISIBLE);
}
} }
private OnAudioFocusChangeListener mAudioFocusListener = !LibVlcUtil.isFroyoOrLater() ? null : private OnAudioFocusChangeListener mAudioFocusListener = !LibVlcUtil.isFroyoOrLater() ? null :
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment