diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-24 11:22:19 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-11-24 11:22:19 -0800 |
| commit | a123fb474de7b49c067e3e812129495a5cacd103 (patch) | |
| tree | 05f082933f966d5b6adf7f7bbd7f8e2ea10cd8ef | |
| parent | 6e031150ce7926b5e90046508d8e6964cf14e166 (diff) | |
| parent | 7e2f9e85a05554e3c04ee982e9125a5d45b48002 (diff) | |
| download | Gallery3D-a123fb474de7b49c067e3e812129495a5cacd103.tar.gz | |
Merge "Fix for crash in PathBarLayer::recomputeComponents"tools_r9tools_r8froyo-plus-aosp
| -rw-r--r-- | src/com/cooliris/media/PathBarLayer.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/cooliris/media/PathBarLayer.java b/src/com/cooliris/media/PathBarLayer.java index c09c407..21e3a2a 100644 --- a/src/com/cooliris/media/PathBarLayer.java +++ b/src/com/cooliris/media/PathBarLayer.java @@ -290,8 +290,10 @@ public final class PathBarLayer extends Layer { int numComponents = mComponents.size(); for (int i = 0; i < numComponents; i++) { Component component = mComponents.get(i); - width -= (component.getIconWidth() + 20.0f * App.PIXEL_DENSITY); - component.computeLabel(width); + if (component != null) { + width -= (component.getIconWidth() + 20.0f * App.PIXEL_DENSITY); + component.computeLabel(width); + } } } } |