| author | Tellen Yu <tellen.yu@amlogic.com> | 2017-07-05 06:40:25 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-07-05 06:40:25 (GMT) |
| commit | 8a02817a44aed88c4a6bd0ad9103bef9afaf8088 (patch) | |
| tree | 367c03bf07ea46d149c2854dda483a97ee78a550 | |
| parent | 1cf42901d0065cfa2c79c0c772485e4f4fae04e8 (diff) | |
| parent | ae2443d0be8e95e0fc9c24e63e0bb4ba6d74ccdb (diff) | |
| download | VideoPlayer-8a02817a44aed88c4a6bd0ad9103bef9afaf8088.zip VideoPlayer-8a02817a44aed88c4a6bd0ad9103bef9afaf8088.tar.gz VideoPlayer-8a02817a44aed88c4a6bd0ad9103bef9afaf8088.tar.bz2 | |
Merge "PD #145663:fix to back to listFile UI and playback to change playbtn state" into m-amlogic
| -rw-r--r-- | src/com/droidlogic/videoplayer/FileList.java | 2 | ||||
| -rw-r--r-- | src/com/droidlogic/videoplayer/VideoPlayer.java | 7 |
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 314cd32..6378439 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(); @@ -2328,7 +2327,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) { |