From d15303bfb3e757cda900031c5a86c95f91e6ca44 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Fri, 1 Mar 2013 16:09:31 -0800
Subject: [PATCH] backout 24dd58c6390c to fix commit message

---
 mobile/android/base/PromptService.java          | 3 ---
 mobile/android/base/resources/values/dimens.xml | 1 -
 2 files changed, 4 deletions(-)

diff --git a/mobile/android/base/PromptService.java b/mobile/android/base/PromptService.java
index 5916381739c7..bdc64d8a9c44 100644
--- a/mobile/android/base/PromptService.java
+++ b/mobile/android/base/PromptService.java
@@ -67,7 +67,6 @@ public class PromptService implements OnClickListener, OnCancelListener, OnItemC
     private final int mIconTextPadding;
     private final int mIconSize;
     private final int mInputPaddingSize;
-    private final int mMinRowSize;
 
     PromptService() {
         sInflater = LayoutInflater.from(GeckoApp.mAppContext);
@@ -79,7 +78,6 @@ public class PromptService implements OnClickListener, OnCancelListener, OnItemC
         mIconTextPadding = (int) (res.getDimension(R.dimen.prompt_service_icon_text_padding));
         mIconSize = (int) (res.getDimension(R.dimen.prompt_service_icon_size));
         mInputPaddingSize = (int) (res.getDimension(R.dimen.prompt_service_inputs_padding));
-        mMinRowSize = (int) (res.getDimension(R.dimen.prompt_service_min_list_item_height));
 
         GeckoAppShell.getEventDispatcher().registerEventListener("Prompt:Show", this);
     }
@@ -694,7 +692,6 @@ public class PromptService implements OnClickListener, OnCancelListener, OnItemC
                 }
 
                 convertView = sInflater.inflate(resourceId, null);
-                convertView.setMinimumHeight(mMinRowSize);
 
                 TextView tv = (TextView) convertView.findViewById(android.R.id.text1);
                 viewHolder = new ViewHolder(tv, tv.getPaddingLeft(), tv.getPaddingRight(),
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index d0bc7b88d4ad..3af15f3552dc 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -44,7 +44,6 @@
     <dimen name="prompt_service_inputs_padding">16dp</dimen>
     <dimen name="prompt_service_left_right_text_with_icon_padding">10dp</dimen>
     <dimen name="prompt_service_top_bottom_text_with_icon_padding">8dp</dimen>
-    <dimen name="prompt_service_min_list_item_height">48dp</dimen>
     <dimen name="remote_tab_child_row_height">64dp</dimen>
     <dimen name="remote_tab_group_row_height">26dp</dimen>
     <dimen name="popup_width">400dp</dimen>