Merge \\"Update listener for animation in Gesture Settings.\\" into nyc-mr1-dev am: b63679157b

am: e65dc0d20e

Change-Id: I4134323420a89305415561c96ea87abb1cdc812f
This commit is contained in:
Doris Ling
2016-06-29 18:01:34 +00:00
committed by android-build-merger

View File

@@ -100,22 +100,18 @@ public final class GesturePreference extends SwitchPreference {
imageView.setVisibility(View.VISIBLE);
playButton.setVisibility(View.VISIBLE);
video.setOnTouchListener(new View.OnTouchListener() {
video.setOnClickListener(new View.OnClickListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
if (event.getAction() == MotionEvent.ACTION_DOWN) {
if (mMediaPlayer != null) {
if (mMediaPlayer.isPlaying()) {
mMediaPlayer.pause();
playButton.setVisibility(View.VISIBLE);
} else {
mMediaPlayer.start();
playButton.setVisibility(View.GONE);
}
public void onClick(View v) {
if (mMediaPlayer != null) {
if (mMediaPlayer.isPlaying()) {
mMediaPlayer.pause();
playButton.setVisibility(View.VISIBLE);
} else {
mMediaPlayer.start();
playButton.setVisibility(View.GONE);
}
return true;
}
return false;
}
});