Merge "Update listener for animation in Gesture Settings." into nyc-mr1-dev

This commit is contained in:
Doris Ling
2016-06-29 17:49:50 +00:00
committed by Android (Google) Code Review

View File

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