widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 523caa4c: Merge "Moved onPause from WidevineSamplePlayer class to VideoPlayerView class. BUG: 5561197" into ics-mr1

Browse Source 
* commit '523caa4c940cb13b05d2c4ce2fd1f12cfbe7be24':
  Moved onPause from WidevineSamplePlayer class to VideoPlayerView class. BUG: 5561197
This commit is contained in:
Edwin Wong
2011-11-10 19:39:26 +00:00
committed by Android Git Automerger
parent 2f6a27e20f 523caa4c94
commit 2987f9b71f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java
View File

@@ -22,6 +22,7 @@ import android.content.Context;
import android.media.MediaPlayer;
import android.media.MediaPlayer.OnErrorListener;
import android.media.MediaPlayer.OnCompletionListener;
import android.util.Log;
public class VideoPlayerView extends Activity {
private final static float BUTTON_FONT_SIZE = 10;
@@ -341,4 +342,10 @@ public class VideoPlayerView extends Activity {
private void updateLogs() {
hRefresh.sendEmptyMessage(REFRESH);
}
@Override
protected void onPause() {
Log.v("VideoPlayerView", "------------------- onPause ----------------");
onStop();
}
}

7
proprietary/samplePlayer/src/com/widevine/demo/WidevineSamplePlayer.java
View File

@@ -9,7 +9,6 @@ import android.os.Bundle;
import android.widget.TabHost;
import android.content.Intent;
import android.content.SharedPreferences;
import android.util.Log;
public class WidevineSamplePlayer extends TabActivity {
@@ -83,10 +82,4 @@ public class WidevineSamplePlayer extends TabActivity {
// Commit the edits!
editor.commit();
}
@Override
protected void onPause() {
Log.v("WVSamplePlayer", "------------------- onPause ----------------");
onStop();
}
}