Fix 5349519: The Select photo/video activity should use action bar.

Change-Id: Ib537926c780fff6edd60d54c3d28740988d6221b

1 files changed, 1 insertions, 27 deletions

diff --git a/src/com/android/gallery3d/app/DialogPicker.java b/src/com/android/gallery3d/app/DialogPicker.java
index ebfc52158..8a5782478 100644
--- a/src/com/android/gallery3d/app/DialogPicker.java
+++ b/src/com/android/gallery3d/app/DialogPicker.java
@@ -17,26 +17,17 @@
 package com.android.gallery3d.app;
 
 import com.android.gallery3d.R;
-import com.android.gallery3d.ui.GLRoot;
-import com.android.gallery3d.ui.GLRootView;
 import com.android.gallery3d.util.GalleryUtils;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
 
-public class DialogPicker extends AbstractGalleryActivity
-        implements OnClickListener {
+public class DialogPicker extends PickerActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.dialog_picker);
-        ((GLRootView) findViewById(R.id.gl_root_view)).setZOrderOnTop(true);
-        findViewById(R.id.cancel).setOnClickListener(this);
-
         int typeBits = GalleryUtils.determineTypeBits(this, getIntent());
         setTitle(GalleryUtils.getSelectionModePrompt(typeBits));
         Intent intent = getIntent();
@@ -48,21 +39,4 @@ public class DialogPicker extends AbstractGalleryActivity
                 getDataManager().getTopSetPath(typeBits));
         getStateManager().startState(AlbumSetPage.class, data);
     }
-
-    @Override
-    public void onBackPressed() {
-        // send the back event to the top sub-state
-        GLRoot root = getGLRoot();
-        root.lockRenderThread();
-        try {
-            getStateManager().getTopState().onBackPressed();
-        } finally {
-            root.unlockRenderThread();
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (v.getId() == R.id.cancel) finish();
-    }
 }