PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refine fingerprint animation handling" into nyc-mr1-dev

Browse Source
This commit is contained in:
Wonsik Kim
2016-07-18 15:31:17 +00:00
committed by Android (Google) Code Review
parent b8257e6fee 52693ab0aa
commit 534d644326
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java
View File

@@ -56,11 +56,20 @@ public class FingerprintLocationAnimationVideoView extends TextureView
protected void onFinishInflate() { protected void onFinishInflate() {
super.onFinishInflate(); super.onFinishInflate();
setSurfaceTextureListener(new SurfaceTextureListener() { setSurfaceTextureListener(new SurfaceTextureListener() {
private SurfaceTexture mTextureToDestroy = null;
@Override @Override
public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width, public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width,
int height) { int height) {
setVisibility(View.INVISIBLE); setVisibility(View.INVISIBLE);
Uri videoUri = resourceEntryToUri(mContext, R.raw.fingerprint_location_animation); Uri videoUri = resourceEntryToUri(mContext, R.raw.fingerprint_location_animation);
if (mMediaPlayer != null) {
mMediaPlayer.release();
}
if (mTextureToDestroy != null) {
mTextureToDestroy.release();
mTextureToDestroy = null;
}
mMediaPlayer = MediaPlayer.create(mContext, videoUri); mMediaPlayer = MediaPlayer.create(mContext, videoUri);
mMediaPlayer.setSurface(new Surface(surfaceTexture)); mMediaPlayer.setSurface(new Surface(surfaceTexture));
mMediaPlayer.setOnPreparedListener(new OnPreparedListener() { mMediaPlayer.setOnPreparedListener(new OnPreparedListener() {
@@ -91,6 +100,7 @@ public class FingerprintLocationAnimationVideoView extends TextureView
@Override @Override
public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) { public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
mTextureToDestroy = surfaceTexture;
return false; return false;
} }