diff options
author | Zhang Zhenzhen <zhangzz6687@thundersoft.com> | 2015-03-10 16:40:13 +0800 |
---|---|---|
committer | Jay Wang <jaywang@codeaurora.org> | 2015-03-18 22:18:11 -0700 |
commit | 38478f2cfc651b58dd88274c9a3bb7526c91116b (patch) | |
tree | 2d38112715d53f79e75015ebd985f283affe99f5 /src/com/android/gallery3d/filtershow/category/CategoryPanel.java | |
parent | d51734fb007055835d706170650aa6765ac32899 (diff) | |
download | android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.tar.gz android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.tar.bz2 android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.zip |
Modify:Gallery2 for branch Gallery2
Conflicts:
res/values-zh-rCN/strings.xml
res/values/strings.xml
Change-Id: I6b760469290ca154f223f94a3c284fca7a513121
Diffstat (limited to 'src/com/android/gallery3d/filtershow/category/CategoryPanel.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/category/CategoryPanel.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/category/CategoryPanel.java b/src/com/android/gallery3d/filtershow/category/CategoryPanel.java index fb51bf5ad..66b352ffb 100644 --- a/src/com/android/gallery3d/filtershow/category/CategoryPanel.java +++ b/src/com/android/gallery3d/filtershow/category/CategoryPanel.java @@ -29,7 +29,7 @@ import android.widget.ListView; import android.widget.TextView; import com.android.gallery3d.R; import com.android.gallery3d.filtershow.FilterShowActivity; - +import android.util.Log; public class CategoryPanel extends Fragment implements View.OnClickListener { public static final String FRAGMENT_TAG = "CategoryPanel"; @@ -89,6 +89,13 @@ public class CategoryPanel extends Fragment implements View.OnClickListener { } break; } + case MainPanel.MAKEUP: { + mAdapter = activity.getCategoryMakeupAdapter(); + if (mAdapter != null) { + mAdapter.initializeSelection(MainPanel.MAKEUP); + } + break; + } } updateAddButtonVisibility(); } @@ -148,7 +155,7 @@ public class CategoryPanel extends Fragment implements View.OnClickListener { return; } FilterShowActivity activity = (FilterShowActivity) getActivity(); - if (activity.isShowingImageStatePanel() && mAdapter.showAddButton()) { + if (activity.isShowingImageStatePanel() && mAdapter != null && mAdapter.showAddButton()) { mAddButton.setVisibility(View.VISIBLE); if (mAdapter != null) { mAddButton.setText(mAdapter.getAddButtonText()); |