Merge "Support hardware colors for fingerprint video" into nyc-mr1-dev (ebd722ce) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ public class FingerprintLocationAnimationVideoView extends TextureView

		public FingerprintLocationAnimationVideoView(Context context, AttributeSet attrs) {
		super(context, attrs);

		}

		@Override
		@@ -52,6 +51,10 @@ public class FingerprintLocationAnimationVideoView extends TextureView
		super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
		}

		protected Uri getFingerprintLocationAnimation() {
		return resourceEntryToUri(getContext(), R.raw.fingerprint_location_animation);
		}

		@Override
		protected void onFinishInflate() {
		super.onFinishInflate();
		@@ -62,7 +65,7 @@ public class FingerprintLocationAnimationVideoView extends TextureView
		public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width,
		int height) {
		setVisibility(View.INVISIBLE);
		Uri videoUri = resourceEntryToUri(mContext, R.raw.fingerprint_location_animation);
		Uri videoUri = getFingerprintLocationAnimation();
		if (mMediaPlayer != null) {
		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();
		return Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" +
		res.getResourcePackageName(id) + '/' +