diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-02-08 17:00:42 -0800 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-02-08 17:00:42 -0800 |
| commit | e5d7ee43c55da14f6de1b392ea928db25499293b (patch) | |
| tree | 247dcb3a03a9ba1e587e78cd7d73c385bf22ae42 /src/com/android/gallery3d/filtershow/PanelController.java | |
| parent | b4e6733731e751afe7dcf2a3b9803d2f720cb253 (diff) | |
| download | android_packages_apps_Snap-e5d7ee43c55da14f6de1b392ea928db25499293b.tar.gz android_packages_apps_Snap-e5d7ee43c55da14f6de1b392ea928db25499293b.tar.bz2 android_packages_apps_Snap-e5d7ee43c55da14f6de1b392ea928db25499293b.zip | |
Fix loading screen
Change-Id: Id41c4c93782bea7f11d75f0ddcdd4529f4fc9758
Diffstat (limited to 'src/com/android/gallery3d/filtershow/PanelController.java')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/PanelController.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index 0f14b9b66..6694e37f6 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -454,7 +454,10 @@ public class PanelController implements OnClickListener { boolean doPanelTransition = true; if (view instanceof FilterIconButton) { ImageFilter f = ((FilterIconButton) view).getImageFilter(); - doPanelTransition = f.showUtilityPanel(); + if (f != null) { + // FIXME: this check shouldn't be necessary + doPanelTransition = f.showUtilityPanel(); + } } if (mUtilityPanel != null && !mUtilityPanel.selected() && doPanelTransition ) { |