diff options
| author | Angus Kong <shkong@google.com> | 2013-10-14 05:19:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-14 05:19:37 +0000 |
| commit | ae1697302b4ef59bbfebdf1127bc73531ce550b7 (patch) | |
| tree | c8f3ebee8f1401cec6b087982f383cdaadf0129c | |
| parent | 24d94d6140ee5ecdf66b28218e8dd9dfe5edfb19 (diff) | |
| parent | d90d0ffc3e69316b105b6f9d03dc98cd5b40ecbf (diff) | |
| download | android_packages_apps_Snap-ae1697302b4ef59bbfebdf1127bc73531ce550b7.tar.gz android_packages_apps_Snap-ae1697302b4ef59bbfebdf1127bc73531ce550b7.tar.bz2 android_packages_apps_Snap-ae1697302b4ef59bbfebdf1127bc73531ce550b7.zip | |
Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad
| -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()); |