summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-05-21 16:01:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-21 16:01:26 -0700
commita4a09f9c0d73876a92c4fddbbd5086fa21899af2 (patch)
treeaf95e4c82fc2fd281b6360525053e36864829477 /src/com/android
parent103b2429c1840ed85dddef636bc7c6ffd03deea2 (diff)
parent550eefae642049dea0023168643b54d1c7a73b8e (diff)
downloadandroid_packages_apps_Gallery2-a4a09f9c0d73876a92c4fddbbd5086fa21899af2.tar.gz
android_packages_apps_Gallery2-a4a09f9c0d73876a92c4fddbbd5086fa21899af2.tar.bz2
android_packages_apps_Gallery2-a4a09f9c0d73876a92c4fddbbd5086fa21899af2.zip
am 550eefae: am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce
* commit '550eefae642049dea0023168643b54d1c7a73b8e': Fix height
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/gallery3d/filtershow/category/CategoryAdapter.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java b/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java
index 0a65cd92f..4dfaa7fe5 100644
--- a/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java
+++ b/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java
@@ -34,7 +34,7 @@ import com.android.gallery3d.filtershow.ui.FilterIconButton;
public class CategoryAdapter extends ArrayAdapter<Action> {
private static final String LOGTAG = "CategoryAdapter";
- private int mItemHeight = 200;
+ private int mItemHeight;
private View mContainer;
private int mItemWidth = ListView.LayoutParams.MATCH_PARENT;
private boolean mUseFilterIconButton = false;
@@ -43,6 +43,7 @@ public class CategoryAdapter extends ArrayAdapter<Action> {
public CategoryAdapter(Context context, int textViewResourceId) {
super(context, textViewResourceId);
+ mItemHeight = (int) (context.getResources().getDisplayMetrics().density * 100);
}
public CategoryAdapter(Context context) {