diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-28 20:08:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-28 20:08:43 -0700 |
| commit | c220cedf70943ec1d7ced1d19b9b58e9e3dd77a7 (patch) | |
| tree | 701aa50794cf11a64ffe9c949f9f11170a407dfa /src/com/android | |
| parent | bf049a6aaf4e012064e6a047cbb51bc843165a7d (diff) | |
| parent | 7aa0b17aeeb65bbe75409837788930a11190170f (diff) | |
| download | android_packages_apps_Gallery2-c220cedf70943ec1d7ced1d19b9b58e9e3dd77a7.tar.gz android_packages_apps_Gallery2-c220cedf70943ec1d7ced1d19b9b58e9e3dd77a7.tar.bz2 android_packages_apps_Gallery2-c220cedf70943ec1d7ced1d19b9b58e9e3dd77a7.zip | |
Merge "SnapdragonGallery: fix gallery crash in monkeytest" into android_ui.lnx.2.1-dev
Diffstat (limited to 'src/com/android')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/gallery3d/filtershow/category/GeometryPanel.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/category/GeometryPanel.java b/src/com/android/gallery3d/filtershow/category/GeometryPanel.java index b0d39175c..7772f1838 100644..100755 --- a/src/com/android/gallery3d/filtershow/category/GeometryPanel.java +++ b/src/com/android/gallery3d/filtershow/category/GeometryPanel.java @@ -79,7 +79,9 @@ public class GeometryPanel extends BasicGeometryPanel { int size = mButtons.length; for (int i = 0; i < size; i++) { ImageButton view = mButtons[i]; - view.setImageDrawable(res.getDrawable(mFiltersRepresentations.get(i).getOverlayId())); + if (mFiltersRepresentations.size() > 0) { + view.setImageDrawable(res.getDrawable(mFiltersRepresentations.get(i).getOverlayId())); + } // ues tag to store index. view.setTag(i); view.setOnClickListener(mOnClickListener); @@ -93,7 +95,9 @@ public class GeometryPanel extends BasicGeometryPanel { int size = mTextViews.length; for (int i = 0; i < size; i++) { TextView view = mTextViews[i]; - view.setText(res.getString(mFiltersRepresentations.get(i).getTextId())); + if (mFiltersRepresentations.size() > 0) { + view.setText(res.getString(mFiltersRepresentations.get(i).getTextId())); + } } } } |