diff options
Diffstat (limited to 'src/com/android/photos/AlbumFragment.java')
-rw-r--r-- | src/com/android/photos/AlbumFragment.java | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/com/android/photos/AlbumFragment.java b/src/com/android/photos/AlbumFragment.java index 377da0970..36416c6f6 100644 --- a/src/com/android/photos/AlbumFragment.java +++ b/src/com/android/photos/AlbumFragment.java @@ -16,6 +16,7 @@ package com.android.photos; +import android.app.Activity; import android.app.Fragment; import android.app.LoaderManager.LoaderCallbacks; import android.content.Context; @@ -42,7 +43,7 @@ import com.android.photos.shims.MediaItemsLoader; import java.util.ArrayList; public class AlbumFragment extends Fragment implements OnItemClickListener, - LoaderCallbacks<Cursor>, MultiChoiceManager.Delegate, SelectionManager.Client { + LoaderCallbacks<Cursor>, MultiChoiceManager.Delegate { protected static final String KEY_ALBUM_URI = "AlbumUri"; private static final int LOADER_ALBUM = 1; @@ -53,17 +54,14 @@ public class AlbumFragment extends Fragment implements OnItemClickListener, private boolean mInitialLoadComplete = false; private LoaderCompatShim<Cursor> mLoaderCompatShim; private PhotoThumbnailAdapter mAdapter; - private MultiChoiceManager mMultiChoiceManager; - private SelectionManager mSelectionManager; private String mAlbumPath; + private GalleryFragmentHost mHost; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Context context = getActivity(); mAdapter = new PhotoThumbnailAdapter(context); - mMultiChoiceManager = new MultiChoiceManager(context, this); - mMultiChoiceManager.setSelectionManager(mSelectionManager); Bundle args = getArguments(); if (args != null) { mAlbumPath = args.getString(KEY_ALBUM_URI, null); @@ -71,14 +69,6 @@ public class AlbumFragment extends Fragment implements OnItemClickListener, } @Override - public void setSelectionManager(SelectionManager manager) { - mSelectionManager = manager; - if (mMultiChoiceManager != null) { - mMultiChoiceManager.setSelectionManager(manager); - } - } - - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View root = inflater.inflate(R.layout.photo_set, container, false); @@ -90,7 +80,7 @@ public class AlbumFragment extends Fragment implements OnItemClickListener, mEmptyView.setVisibility(View.GONE); mAlbumView.setAdapter(mAdapter); mAlbumView.setChoiceMode(GridView.CHOICE_MODE_MULTIPLE_MODAL); - mAlbumView.setMultiChoiceModeListener(mMultiChoiceManager); + mAlbumView.setMultiChoiceModeListener(mHost.getMultiChoiceManager()); getLoaderManager().initLoader(LOADER_ALBUM, null, this); updateEmptyStatus(); return root; @@ -104,6 +94,18 @@ public class AlbumFragment extends Fragment implements OnItemClickListener, } @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + mHost = (GalleryFragmentHost) activity; + } + + @Override + public void onDetach() { + super.onDetach(); + mHost = null; + } + + @Override public void onItemClick(AdapterView<?> parent, View view, int position, long id) { if (mLoaderCompatShim == null) { |