diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-09-23 18:36:25 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-09-23 18:36:25 -0700 |
| commit | 26f23e62096eb50344815e1b066e9a1efb629bb0 (patch) | |
| tree | 903bd62ed07915b077f733d85088fdc604c5f3fc /src | |
| parent | 105fbcf3289491aa4f590057e304fee33f1c88ca (diff) | |
| download | android_packages_apps_Gallery2-26f23e62096eb50344815e1b066e9a1efb629bb0.tar.gz android_packages_apps_Gallery2-26f23e62096eb50344815e1b066e9a1efb629bb0.tar.bz2 android_packages_apps_Gallery2-26f23e62096eb50344815e1b066e9a1efb629bb0.zip | |
Fix crashes after switching languages
bug:8148068
Change-Id: Icb23c8b221e52fe26981887a0af9857f3d58bf79
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 3 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/category/CategoryPanel.java | 30 |
2 files changed, 24 insertions, 9 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index c4aca73a7..0fe1dd558 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -700,6 +700,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } public void updateCategories() { + if (mMasterImage == null) { + return; + } ImagePreset preset = mMasterImage.getPreset(); mCategoryLooksAdapter.reflectImagePreset(preset); mCategoryBordersAdapter.reflectImagePreset(preset); diff --git a/src/com/android/gallery3d/filtershow/category/CategoryPanel.java b/src/com/android/gallery3d/filtershow/category/CategoryPanel.java index d1b7d1858..fb51bf5ad 100644 --- a/src/com/android/gallery3d/filtershow/category/CategoryPanel.java +++ b/src/com/android/gallery3d/filtershow/category/CategoryPanel.java @@ -54,29 +54,39 @@ public class CategoryPanel extends Fragment implements View.OnClickListener { switch (adapter) { case MainPanel.LOOKS: { mAdapter = activity.getCategoryLooksAdapter(); - mAdapter.initializeSelection(MainPanel.LOOKS); + if (mAdapter != null) { + mAdapter.initializeSelection(MainPanel.LOOKS); + } activity.updateCategories(); break; } case MainPanel.BORDERS: { mAdapter = activity.getCategoryBordersAdapter(); - mAdapter.initializeSelection(MainPanel.BORDERS); + if (mAdapter != null) { + mAdapter.initializeSelection(MainPanel.BORDERS); + } activity.updateCategories(); break; } case MainPanel.GEOMETRY: { mAdapter = activity.getCategoryGeometryAdapter(); - mAdapter.initializeSelection(MainPanel.GEOMETRY); + if (mAdapter != null) { + mAdapter.initializeSelection(MainPanel.GEOMETRY); + } break; } case MainPanel.FILTERS: { mAdapter = activity.getCategoryFiltersAdapter(); - mAdapter.initializeSelection(MainPanel.FILTERS); + if (mAdapter != null) { + mAdapter.initializeSelection(MainPanel.FILTERS); + } break; } case MainPanel.VERSIONS: { mAdapter = activity.getCategoryVersionsAdapter(); - mAdapter.initializeSelection(MainPanel.VERSIONS); + if (mAdapter != null) { + mAdapter.initializeSelection(MainPanel.VERSIONS); + } break; } } @@ -104,10 +114,12 @@ public class CategoryPanel extends Fragment implements View.OnClickListener { View panelView = main.findViewById(R.id.listItems); if (panelView instanceof CategoryTrack) { CategoryTrack panel = (CategoryTrack) panelView; - mAdapter.setOrientation(CategoryView.HORIZONTAL); - panel.setAdapter(mAdapter); - mAdapter.setContainer(panel); - } else { + if (mAdapter != null) { + mAdapter.setOrientation(CategoryView.HORIZONTAL); + panel.setAdapter(mAdapter); + mAdapter.setContainer(panel); + } + } else if (mAdapter != null) { ListView panel = (ListView) main.findViewById(R.id.listItems); panel.setAdapter(mAdapter); mAdapter.setContainer(panel); |