summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/info
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-08-14 12:14:54 -0700
committerJohn Hoford <hoford@google.com>2013-08-14 12:14:54 -0700
commit5d1cf1f9c8c6359905988e096b50f07ce326df21 (patch)
tree78ccdde6f5f3f82a6b7d331148b1aecd5e995d11 /src/com/android/gallery3d/filtershow/info
parent3130144bcd9403153b9385f9b91d4262d626a113 (diff)
downloadandroid_packages_apps_Gallery2-5d1cf1f9c8c6359905988e096b50f07ce326df21.tar.gz
android_packages_apps_Gallery2-5d1cf1f9c8c6359905988e096b50f07ce326df21.tar.bz2
android_packages_apps_Gallery2-5d1cf1f9c8c6359905988e096b50f07ce326df21.zip
Add close button to info panel
Change-Id: Iba4c64af4e37bc3d03cc3cb1ee371158d210c5f8
Diffstat (limited to 'src/com/android/gallery3d/filtershow/info')
-rw-r--r--src/com/android/gallery3d/filtershow/info/InfoPanel.java13
1 files changed, 12 insertions, 1 deletions
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;