diff options
| author | John Hoford <hoford@google.com> | 2013-04-19 01:41:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-19 01:41:44 +0000 |
| commit | d81bba2275dc393278239aa1d5617d3d6a7bfe2a (patch) | |
| tree | dc879babbcee83f5da487b992b648b3f09c214f5 /src/com/android/gallery3d/filtershow/PanelController.java | |
| parent | 0c65f5f024b62c67293073afff3543d72a84a5d0 (diff) | |
| parent | 1ffe73e1e757b3c658f24c151358bfb4163460ba (diff) | |
| download | android_packages_apps_Snap-d81bba2275dc393278239aa1d5617d3d6a7bfe2a.tar.gz android_packages_apps_Snap-d81bba2275dc393278239aa1d5617d3d6a7bfe2a.tar.bz2 android_packages_apps_Snap-d81bba2275dc393278239aa1d5617d3d6a7bfe2a.zip | |
Merge "fixed borders issues" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d/filtershow/PanelController.java')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/PanelController.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index e9a913610..2cd70e3aa 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -598,6 +598,7 @@ public class PanelController implements OnClickListener { mCurrentEditor = null; FilterIconButton component = (FilterIconButton) view; FilterRepresentation representation = component.getFilterRepresentation(); + if (representation != null) { mUtilityPanel.setEffectName(representation.getName()); mUtilityPanel.setShowParameter(representation.showParameterValue()); |