am 26f23e62: Fix crashes after switching languages (b920df87) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -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);

src/com/android/gallery3d/filtershow/category/CategoryPanel.java

+21 −9

Original line number	Diff line number	Diff line
		@@ -54,29 +54,39 @@ public class CategoryPanel extends Fragment implements View.OnClickListener {
		switch (adapter) {
		case MainPanel.LOOKS: {
		mAdapter = activity.getCategoryLooksAdapter();
		if (mAdapter != null) {
		mAdapter.initializeSelection(MainPanel.LOOKS);
		}
		activity.updateCategories();
		break;
		}
		case MainPanel.BORDERS: {
		mAdapter = activity.getCategoryBordersAdapter();
		if (mAdapter != null) {
		mAdapter.initializeSelection(MainPanel.BORDERS);
		}
		activity.updateCategories();
		break;
		}
		case MainPanel.GEOMETRY: {
		mAdapter = activity.getCategoryGeometryAdapter();
		if (mAdapter != null) {
		mAdapter.initializeSelection(MainPanel.GEOMETRY);
		}
		break;
		}
		case MainPanel.FILTERS: {
		mAdapter = activity.getCategoryFiltersAdapter();
		if (mAdapter != null) {
		mAdapter.initializeSelection(MainPanel.FILTERS);
		}
		break;
		}
		case MainPanel.VERSIONS: {
		mAdapter = activity.getCategoryVersionsAdapter();
		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;
		if (mAdapter != null) {
		mAdapter.setOrientation(CategoryView.HORIZONTAL);
		panel.setAdapter(mAdapter);
		mAdapter.setContainer(panel);
		} else {
		}
		} else if (mAdapter != null) {
		ListView panel = (ListView) main.findViewById(R.id.listItems);
		panel.setAdapter(mAdapter);
		mAdapter.setContainer(panel);