diff options
| author | Angus Kong <shkong@google.com> | 2013-10-13 22:21:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-13 22:21:30 -0700 |
| commit | 4a0a1ff8311b61f4bfeb79b27857b300e41a4859 (patch) | |
| tree | 253e1ced6622d4b6bfd10a4f1feeacbdc2c60611 | |
| parent | 7da0c4cda65e2d8b22e0324ebbe34696a0750993 (diff) | |
| parent | ae1697302b4ef59bbfebdf1127bc73531ce550b7 (diff) | |
| download | android_packages_apps_Snap-4a0a1ff8311b61f4bfeb79b27857b300e41a4859.tar.gz android_packages_apps_Snap-4a0a1ff8311b61f4bfeb79b27857b300e41a4859.tar.bz2 android_packages_apps_Snap-4a0a1ff8311b61f4bfeb79b27857b300e41a4859.zip | |
am ae169730: Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad
* commit 'ae1697302b4ef59bbfebdf1127bc73531ce550b7':
Ignore clicks on disabled pie menu items.
| -rw-r--r-- | src/com/android/camera/PieController.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/PieController.java b/src/com/android/camera/PieController.java index 3cbcb4bf5..622440151 100644 --- a/src/com/android/camera/PieController.java +++ b/src/com/android/camera/PieController.java @@ -156,6 +156,9 @@ public class PieController { item.setOnClickListener(new OnClickListener() { @Override public void onClick(PieItem item) { + if (!item.isEnabled()) { + return; + } IconListPreference pref = (IconListPreference) mPreferenceGroup .findPreference(prefKey); int index = pref.findIndexOfValue(pref.getValue()); |