From fea8b881ff7b2c82becfc14a71869079e682cffc Mon Sep 17 00:00:00 2001 From: Chao Zhang Date: Wed, 30 Mar 2016 10:51:46 +0800 Subject: Gallery2: fix crash in photo editor after change system language. revert the judgement of showPanel() in MainPanel.onCreateView() which is removed in change 'I33a031063d8392fecf4de071f62bf46b2aaa57e2'. fix a NullPointerException in AlbumSetPage. Change-Id: I90d88a8b6fdb404213c908961f3615da79b424b0 CRs-Fixed: 995401 995399 --- src/com/android/gallery3d/app/AlbumPage.java | 9 +++++++-- src/com/android/gallery3d/app/AlbumSetPage.java | 8 +++++++- src/com/android/gallery3d/app/TimeLinePage.java | 8 +++++++- src/com/android/gallery3d/filtershow/category/MainPanel.java | 11 +++++++++-- 4 files changed, 30 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index 60454de9f..44fe2a650 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -197,8 +197,13 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster paddingBottom = mConfig.paddingBottom; paddingRight = mConfig.paddingRight; - int slotViewTop = mActivity.getToolbar().getLayoutParams().height - + paddingTop; + int slotViewTop; + Toolbar toolbar = mActivity.getToolbar(); + if (toolbar != null) { + slotViewTop = toolbar.getLayoutParams().height + paddingTop; + } else { + slotViewTop = mActivity.getGalleryActionBar().getHeight() + paddingTop; + } int slotViewBottom = bottom - top - paddingBottom; int slotViewRight = right - left - paddingRight; int slotViewLeft = paddingLeft; diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index d8dbad373..31b0e3840 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -160,7 +160,13 @@ public class AlbumSetPage extends ActivityState implements paddingLeft = mConfig.paddingLeft; } - int slotViewTop = mActivity.getToolbar().getLayoutParams().height + paddingTop; + int slotViewTop; + android.widget.Toolbar toolbar = mActivity.getToolbar(); + if (toolbar != null) { + slotViewTop = toolbar.getLayoutParams().height + paddingTop; + } else { + slotViewTop = mActivity.getGalleryActionBar().getHeight() + paddingTop; + } int slotViewBottom = bottom - top - paddingBottom; int slotViewRight = right - left - paddingRight; int slotViewLeft = paddingLeft ; diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java index b318aaf07..a1f56b062 100644 --- a/src/com/android/gallery3d/app/TimeLinePage.java +++ b/src/com/android/gallery3d/app/TimeLinePage.java @@ -168,7 +168,13 @@ public class TimeLinePage extends ActivityState implements protected void onLayout( boolean changed, int left, int top, int right, int bottom) { - int slotViewTop = mActivity.getToolbar().getLayoutParams().height; + int slotViewTop; + android.widget.Toolbar toolbar = mActivity.getToolbar(); + if (toolbar != null) { + slotViewTop = toolbar.getLayoutParams().height; + } else { + slotViewTop = mActivity.getGalleryActionBar().getHeight(); + } int padding =0 ; if((right - left) > (bottom - top)) { padding = (int) mActivity.getResources().getDimension(R.dimen.timeline_land_margin); diff --git a/src/com/android/gallery3d/filtershow/category/MainPanel.java b/src/com/android/gallery3d/filtershow/category/MainPanel.java index 0f6b66116..fa583c91b 100644 --- a/src/com/android/gallery3d/filtershow/category/MainPanel.java +++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java @@ -139,6 +139,11 @@ public class MainPanel extends Fragment { makeupButton.setVisibility(View.VISIBLE); } + boolean showPanel = false; + if (getArguments() != null) { + showPanel = getArguments().getBoolean(EDITOR_TAG); + } + if (makeupButton != null) { makeupButton.setOnClickListener(new View.OnClickListener() { @Override @@ -217,8 +222,10 @@ public class MainPanel extends Fragment { }); FilterShowActivity activity = (FilterShowActivity) getActivity(); - showImageStatePanel(activity.isShowingImageStatePanel()); - showPanel(activity.getCurrentPanel()); +// showImageStatePanel(activity.isShowingImageStatePanel()); + if (showPanel) { + showPanel(activity.getCurrentPanel()); + } return mMainView; } -- cgit v1.2.3