Revert "Move Gallery2 to androidx."

[android-x86/packages-apps-Gallery2.git] / src / com / android / photos / GalleryActivity.java

diff --git a/src/com/android/photos/GalleryActivity.java b/src/com/android/photos/GalleryActivity.java
index ddf04e3..f3279fe 100644 (file)
--- a/src/com/android/photos/GalleryActivity.java
+++ b/src/com/android/photos/GalleryActivity.java
@@ -21,29 +21,28 @@ import android.app.ActionBar.Tab;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.ViewGroup;
 
-import com.android.camera.CameraActivity;
 import com.android.gallery3d.R;
 
 import java.util.ArrayList;
 
-public class GalleryActivity extends Activity {
+public class GalleryActivity extends Activity implements MultiChoiceManager.Provider {
 
-    private SelectionManager mSelectionManager;
+    private MultiChoiceManager mMultiChoiceManager;
     private ViewPager mViewPager;
     private TabsAdapter mTabsAdapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mSelectionManager = new SelectionManager(this);
+        mMultiChoiceManager = new MultiChoiceManager(this);
         mViewPager = new ViewPager(this);
         mViewPager.setId(R.id.viewpager);
         setContentView(mViewPager);
@@ -80,10 +79,12 @@ public class GalleryActivity extends Activity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
         case R.id.menu_camera:
-            Intent intent = new Intent(this, CameraActivity.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(intent);
-            return true;
+            // TODO: Call the correct Camera intent.
+            throw new RuntimeException("Not implemented yet.");
+//            Intent intent = new Intent(this, CameraActivity.class);
+//            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//            startActivity(intent);
+//            return true;
         default:
             return super.onOptionsItemSelected(item);
         }
@@ -134,11 +135,8 @@ public class GalleryActivity extends Activity {
         @Override
         public Fragment getItem(int position) {
             TabInfo info = mTabs.get(position);
-            Fragment item = Fragment.instantiate(mActivity, info.clss.getName(),
+            return Fragment.instantiate(mActivity, info.clss.getName(),
                     info.args);
-            ((SelectionManager.Client) item).setSelectionManager(
-                    mActivity.mSelectionManager);
-            return item;
         }
 
         @Override
@@ -152,6 +150,12 @@ public class GalleryActivity extends Activity {
         }
 
         @Override
+        public void setPrimaryItem(ViewGroup container, int position, Object object) {
+            super.setPrimaryItem(container, position, object);
+            mActivity.mMultiChoiceManager.setDelegate((MultiChoiceManager.Delegate) object);
+        }
+
+        @Override
         public void onPageScrollStateChanged(int state) {
         }
 
@@ -173,4 +177,9 @@ public class GalleryActivity extends Activity {
         public void onTabReselected(Tab tab, FragmentTransaction ft) {
         }
     }
+
+    @Override
+    public MultiChoiceManager getMultiChoiceManager() {
+        return mMultiChoiceManager;
+    }
 }