Merge branch 'working' into 'develop'

toggle video controller with the top bar

Closes #935

See merge request tom79/mastalab!2464
This commit is contained in:
Thomas 2019-05-24 15:25:52 +00:00
commit f07ebeea8a
1 changed files with 4 additions and 0 deletions

View File

@ -329,6 +329,8 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
if (media_description.getVisibility() == View.VISIBLE) {
media_description.setVisibility(View.GONE);
}
if (videoView.getVisibility() == View.VISIBLE)
videoView.hideController();
}
} else {
action_bar_container.setVisibility(View.VISIBLE);
@ -341,6 +343,8 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
media_description.setText("");
media_description.setVisibility(View.GONE);
}
if (videoView.getVisibility() == View.VISIBLE)
videoView.showController();
}