Add close button to info panel

Change-Id: Iba4c64af4e37bc3d03cc3cb1ee371158d210c5f8

2 files changed, 15 insertions, 4 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 43f132505..523b00e6e 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -320,7 +320,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         }
     }
 
-    private void hideInformationPanel() {
+    public void hideInformationPanel() {
         FrameLayout infoLayout = (FrameLayout) findViewById(R.id.central_panel_container);
         infoLayout.setVisibility(View.GONE);
         Fragment fragment = getSupportFragmentManager().findFragmentByTag(InfoPanel.FRAGMENT_TAG);
@@ -332,7 +332,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         mShowingInformationPanel = false;
     }
 
-    public void showInformationPanel() {
+    public void toggleInformationPanel() {
         mShowingInformationPanel = !mShowingInformationPanel;
         if (!mShowingInformationPanel) {
             hideInformationPanel();
@@ -957,7 +957,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
                 return true;
             }
             case R.id.showInfoPanel: {
-                showInformationPanel();
+                toggleInformationPanel();
                 return true;
             }
         }
diff --git a/src/com/android/gallery3d/filtershow/info/InfoPanel.java b/src/com/android/gallery3d/filtershow/info/InfoPanel.java
index a06527f3a..39102f186 100644
--- a/src/com/android/gallery3d/filtershow/info/InfoPanel.java
+++ b/src/com/android/gallery3d/filtershow/info/InfoPanel.java
@@ -22,16 +22,17 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.text.Html;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.android.gallery3d.R;
 import com.android.gallery3d.exif.ExifInterface;
 import com.android.gallery3d.exif.ExifTag;
+import com.android.gallery3d.filtershow.FilterShowActivity;
 import com.android.gallery3d.filtershow.cache.ImageLoader;
 import com.android.gallery3d.filtershow.imageshow.MasterImage;
 
@@ -45,6 +46,7 @@ public class InfoPanel extends Fragment {
     private TextView mImageName;
     private TextView mImageSize;
     private TextView mExifData;
+    private ImageButton mHideButton;
 
     private String createStringFromIfFound(ExifTag exifTag, int tag, int str) {
         String exifString = "";
@@ -72,10 +74,19 @@ public class InfoPanel extends Fragment {
         mImageName = (TextView) mMainView.findViewById(R.id.imageName);
         mImageSize = (TextView) mMainView.findViewById(R.id.imageSize);
         mExifData = (TextView) mMainView.findViewById(R.id.exifData);
+        mHideButton =(ImageButton) mMainView.findViewById(R.id.cancelInfo);
+
         HistogramView histogramView = (HistogramView) mMainView.findViewById(R.id.histogramView);
 
         histogramView.setBitmap(bitmap);
 
+        mHideButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                FilterShowActivity activity = (FilterShowActivity)getActivity();
+                activity.toggleInformationPanel();
+            }
+        });
         Uri uri = MasterImage.getImage().getUri();
         String path = ImageLoader.getLocalPathFromUri(getActivity(), uri);
         Uri localUri = null;