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

Merge \"Support hardware colors for fingerprint video\" into nyc-mr1-dev

Browse Source 
am: ebd722ce5b

Change-Id: Ibe34d29438026e2e5bfd233e9a245025a9e66931
This commit is contained in:
Maurice Lam
2016-07-18 23:36:15 +00:00
committed by android-build-merger
parent fe8e89e2fc ebd722ce5b
commit c203aeb1c8
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,6 @@ public class FingerprintLocationAnimationVideoView extends TextureView
public FingerprintLocationAnimationVideoView(Context context, AttributeSet attrs) { public FingerprintLocationAnimationVideoView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
} }
@Override @Override
@@ -52,6 +51,10 @@ public class FingerprintLocationAnimationVideoView extends TextureView
super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)); super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
} }
protected Uri getFingerprintLocationAnimation() {
return resourceEntryToUri(getContext(), R.raw.fingerprint_location_animation);
}
@Override @Override
protected void onFinishInflate() { protected void onFinishInflate() {
super.onFinishInflate(); super.onFinishInflate();
@@ -62,7 +65,7 @@ public class FingerprintLocationAnimationVideoView extends TextureView
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 = getFingerprintLocationAnimation();
if (mMediaPlayer != null) { if (mMediaPlayer != null) {
mMediaPlayer.release(); mMediaPlayer.release();
} }
@@ -110,7 +113,7 @@ public class FingerprintLocationAnimationVideoView extends TextureView
}); });
} }
private static Uri resourceEntryToUri (Context context, int id) { protected static Uri resourceEntryToUri (Context context, int id) {
Resources res = context.getResources(); Resources res = context.getResources();
return Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + return Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" +
res.getResourcePackageName(id) + '/' + res.getResourcePackageName(id) + '/' +