diff options
| author | Romain Guy <romainguy@android.com> | 2010-04-14 14:45:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-14 14:45:43 -0700 |
| commit | 1b2d7ec487b09bf930d32e12e5004c161c083187 (patch) | |
| tree | 8fa2f6e9b10440a4883ef627f7be9e3d36a55bd0 /core/java/android/widget | |
| parent | 7946d07183c2020b7421113e3a113763eac15a67 (diff) | |
| parent | 6691fcfbc806ecfd884ab2e5ff75994d7ee3ddd5 (diff) | |
| download | frameworks_base-1b2d7ec487b09bf930d32e12e5004c161c083187.zip frameworks_base-1b2d7ec487b09bf930d32e12e5004c161c083187.tar.gz frameworks_base-1b2d7ec487b09bf930d32e12e5004c161c083187.tar.bz2 | |
Merge "Ensure Gallery does not unselect the selected item after a layout. Bug #2573921"
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/Gallery.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/Gallery.java b/core/java/android/widget/Gallery.java index f34823c..6775a94 100644 --- a/core/java/android/widget/Gallery.java +++ b/core/java/android/widget/Gallery.java @@ -1207,7 +1207,7 @@ public class Gallery extends AbsSpinner implements GestureDetector.OnGestureList // We unfocus the old child down here so the above hasFocus check // returns true - if (oldSelectedChild != null) { + if (oldSelectedChild != null && oldSelectedChild != child) { // Make sure its drawable state doesn't contain 'selected' oldSelectedChild.setSelected(false); @@ -1263,6 +1263,7 @@ public class Gallery extends AbsSpinner implements GestureDetector.OnGestureList */ if (gainFocus && mSelectedChild != null) { mSelectedChild.requestFocus(direction); + mSelectedChild.setSelected(true); } } |