summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-05-21 15:57:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-21 15:57:48 -0700
commit550eefae642049dea0023168643b54d1c7a73b8e (patch)
tree41cb587f5e26eb051bbc75693d2a9abd8202379c /src
parent0cf42d07132b27aa1f50707fbf5aa30fde925cbf (diff)
parent01ae91aa0e347c5a8b335afc8cb0f02459ee5adc (diff)
downloadandroid_packages_apps_Gallery2-550eefae642049dea0023168643b54d1c7a73b8e.tar.gz
android_packages_apps_Gallery2-550eefae642049dea0023168643b54d1c7a73b8e.tar.bz2
android_packages_apps_Gallery2-550eefae642049dea0023168643b54d1c7a73b8e.zip
am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce
* commit '01ae91aa0e347c5a8b335afc8cb0f02459ee5adc': Fix height
Diffstat (limited to 'src')
-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) {