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

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

Browse Source 
am: b63679157b

Change-Id: I88ee4177303737d1622ba9b326610418c7269a58
This commit is contained in:
Doris Ling
2016-06-29 17:58:54 +00:00
committed by android-build-merger
parent d623d3f6d3 b63679157b
commit e65dc0d20e
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/gestures/GesturePreference.java
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;
} }
}); });