提交: a4f0526dc8d993fb914d0e6505e22a1f30ad0e14 - packages-apps-Gallery2 (git)

packages/apps/Gallery2

Commit MetaInfo

• 修订版: a4f0526dc8d993fb914d0e6505e22a1f30ad0e14 (tree)
• 时间: 2011-08-26 22:15:07
• 作者: Ray Chen <raychen@goog...>
• Commiter: Ray Chen

Log Message

Fix 5133608 [UI] Details should be displayed as a system dialog in phone UI

We need this to reset the grid drawer.

Change-Id: Iead6568db1903d7e722f0e8154388ccd8f1aee67

更改概述

• modified: src/com/android/gallery3d/app/AlbumPage.java
• modified: src/com/android/gallery3d/app/AlbumSetPage.java
• modified: src/com/android/gallery3d/ui/DialogDetailsView.java

差异

--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -410,8 +410,9 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
 
     private void hideDetails() {
         mShowDetails = false;
-        mAlbumView.setSelectionDrawer(mGridDrawer);
         mDetailsHelper.hide();
+        mAlbumView.setSelectionDrawer(mGridDrawer);
+        mAlbumView.invalidate();
     }
 
     @Override

--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -514,8 +514,9 @@ public class AlbumSetPage extends ActivityState implements
 
     private void hideDetails() {
         mShowDetails = false;
-        mAlbumSetView.setSelectionDrawer(mGridDrawer);
         mDetailsHelper.hide();
+        mAlbumSetView.setSelectionDrawer(mGridDrawer);
+        mAlbumSetView.invalidate();
     }
 
     private void showDetails() {

--- a/src/com/android/gallery3d/ui/DialogDetailsView.java
+++ b/src/com/android/gallery3d/ui/DialogDetailsView.java
@@ -42,6 +42,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
 import android.database.DataSetObserver;
 import android.graphics.Color;
 import android.graphics.Rect;
@@ -72,6 +73,7 @@ public class DialogDetailsView implements DetailsViewContainer {
     private int mIndex;
     private Dialog mDialog;
     private int mLocationIndex;
+    private CloseListener mListener;
 
     public DialogDetailsView(GalleryActivity activity, DetailsSource source) {
         mContext = activity;
@@ -117,6 +119,14 @@ public class DialogDetailsView implements DetailsViewContainer {
                 }
             })
             .create();
+
+        mDialog.setOnDismissListener(new OnDismissListener() {
+            public void onDismiss(DialogInterface dialog) {
+                if (mListener != null) {
+                    mListener.onClose();
+                }
+            }
+        });
     }
 
     private class DetailsAdapter extends BaseAdapter implements AddressResolvingListener {
@@ -235,5 +245,6 @@ public class DialogDetailsView implements DetailsViewContainer {
     }
 
     public void setCloseListener(CloseListener listener) {
+        mListener = listener;
     }
 }