summaryrefslogtreecommitdiff
authorlu.wang <lu.wang@amlogic.com>2017-06-26 12:01:44 (GMT)
committer lu.wang <lu.wang@amlogic.com>2017-07-05 02:31:05 (GMT)
commitae2443d0be8e95e0fc9c24e63e0bb4ba6d74ccdb (patch)
treee9075697a8edd7c7b5f6ed8505e11e0e3e8f015c
parent1ffa41821da2da36aef2542aee32a61596bbd1d4 (diff)
downloadVideoPlayer-ae2443d0be8e95e0fc9c24e63e0bb4ba6d74ccdb.zip
VideoPlayer-ae2443d0be8e95e0fc9c24e63e0bb4ba6d74ccdb.tar.gz
VideoPlayer-ae2443d0be8e95e0fc9c24e63e0bb4ba6d74ccdb.tar.bz2
PD #145663:fix to back to listFile UI and playback to change playbtn state
Change-Id: I38127a3101d8869e94b7fccea900d848d49c41d6
Diffstat
-rw-r--r--src/com/droidlogic/videoplayer/FileList.java2
-rw-r--r--src/com/droidlogic/videoplayer/VideoPlayer.java7
2 files changed, 4 insertions, 5 deletions
diff --git a/src/com/droidlogic/videoplayer/FileList.java b/src/com/droidlogic/videoplayer/FileList.java
index c41c842..fb5ab93 100644
--- a/src/com/droidlogic/videoplayer/FileList.java
+++ b/src/com/droidlogic/videoplayer/FileList.java
@@ -980,7 +980,7 @@ public class FileList extends ListActivity {
FileList.this.finish();
}*/
startActivity (intent);
- FileList.this.finish();
+// FileList.this.finish();
}
public int filterDir (File file) {
diff --git a/src/com/droidlogic/videoplayer/VideoPlayer.java b/src/com/droidlogic/videoplayer/VideoPlayer.java
index 9064c17..48085d8 100644
--- a/src/com/droidlogic/videoplayer/VideoPlayer.java
+++ b/src/com/droidlogic/videoplayer/VideoPlayer.java
@@ -255,7 +255,6 @@ public class VideoPlayer extends Activity {
@Override
public void onResume() {
super.onResume();
-
if (!mPermissionGranted) {
return;
}
@@ -538,11 +537,11 @@ public class VideoPlayer extends Activity {
curtime = getCurrentPosition();
totaltime = getDuration();
// add for seeking to head
- /*if(curtime <= 1000) { //current time is equal or smaller than 1S stop fw/fb
+ if (curtime <= 1000) { //current time is equal or smaller than 1S stop fw/fb
stopFWFB();
mState = STATE_PLAYING;
updateIconResource();
- }*/
+ }
LOGI (TAG, "[updateProgressbar]curtime:" + curtime + ",totaltime:" + totaltime + ",progressBar:" + progressBar + ",ctlbar:" + ctlbar + ",ctlbar.getVisibility():" + ctlbar.getVisibility());
if (curTimeTx != null && totalTimeTx != null && progressBar != null) {
int flag = getCurOsdViewFlag();
@@ -2327,7 +2326,7 @@ public class VideoPlayer extends Activity {
item_position_selected = item_position_selected_init + mPlayList.getindex();
browserBackDoing = true;
if (browserBackInvokeFromOnPause == true) {
- mPlayList.rootPath = null;
+// mPlayList.rootPath = null;
}
else {
if (!backToOtherAPK) {