summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/Gallery.java
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-05-01 06:47:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-01 06:47:24 -0700
commitf6d8e0cafd4cd8501988b0a13379bbfa594f21f7 (patch)
tree8a190c94c5563679dd7b76fe1634a90cf4d6281f /core/java/android/widget/Gallery.java
parent2d28f53514d55bfc3fb2eb2ebdd6c85ef3d8f9d9 (diff)
parent50bd9d616695b2162b84a204bc678b83a14f59c9 (diff)
downloadframeworks_base-f6d8e0cafd4cd8501988b0a13379bbfa594f21f7.zip
frameworks_base-f6d8e0cafd4cd8501988b0a13379bbfa594f21f7.tar.gz
frameworks_base-f6d8e0cafd4cd8501988b0a13379bbfa594f21f7.tar.bz2
am 50bd9d61: am 4426961e: Merge "Avoiding horizontal keypad navigation trapping within gallery."
* commit '50bd9d616695b2162b84a204bc678b83a14f59c9': Avoiding horizontal keypad navigation trapping within gallery.
Diffstat (limited to 'core/java/android/widget/Gallery.java')
-rw-r--r--core/java/android/widget/Gallery.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/widget/Gallery.java b/core/java/android/widget/Gallery.java
index 03fdc39..0a3d333 100644
--- a/core/java/android/widget/Gallery.java
+++ b/core/java/android/widget/Gallery.java
@@ -1189,15 +1189,15 @@ public class Gallery extends AbsSpinner implements GestureDetector.OnGestureList
case KeyEvent.KEYCODE_DPAD_LEFT:
if (movePrevious()) {
playSoundEffect(SoundEffectConstants.NAVIGATION_LEFT);
+ return true;
}
- return true;
-
+ break;
case KeyEvent.KEYCODE_DPAD_RIGHT:
if (moveNext()) {
playSoundEffect(SoundEffectConstants.NAVIGATION_RIGHT);
+ return true;
}
- return true;
-
+ break;
case KeyEvent.KEYCODE_DPAD_CENTER:
case KeyEvent.KEYCODE_ENTER:
mReceivedInvokeKeyDown = true;