backout 24dd58c6390c to fix commit message

This commit is contained in:
Wes Johnston 2013-03-01 16:09:31 -08:00
Родитель 96114f55fc
Коммит d15303bfb3
2 изменённых файлов: 0 добавлений и 4 удалений

Просмотреть файл

@ -67,7 +67,6 @@ public class PromptService implements OnClickListener, OnCancelListener, OnItemC
private final int mIconTextPadding; private final int mIconTextPadding;
private final int mIconSize; private final int mIconSize;
private final int mInputPaddingSize; private final int mInputPaddingSize;
private final int mMinRowSize;
PromptService() { PromptService() {
sInflater = LayoutInflater.from(GeckoApp.mAppContext); 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)); mIconTextPadding = (int) (res.getDimension(R.dimen.prompt_service_icon_text_padding));
mIconSize = (int) (res.getDimension(R.dimen.prompt_service_icon_size)); mIconSize = (int) (res.getDimension(R.dimen.prompt_service_icon_size));
mInputPaddingSize = (int) (res.getDimension(R.dimen.prompt_service_inputs_padding)); 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); GeckoAppShell.getEventDispatcher().registerEventListener("Prompt:Show", this);
} }
@ -694,7 +692,6 @@ public class PromptService implements OnClickListener, OnCancelListener, OnItemC
} }
convertView = sInflater.inflate(resourceId, null); convertView = sInflater.inflate(resourceId, null);
convertView.setMinimumHeight(mMinRowSize);
TextView tv = (TextView) convertView.findViewById(android.R.id.text1); TextView tv = (TextView) convertView.findViewById(android.R.id.text1);
viewHolder = new ViewHolder(tv, tv.getPaddingLeft(), tv.getPaddingRight(), viewHolder = new ViewHolder(tv, tv.getPaddingLeft(), tv.getPaddingRight(),

Просмотреть файл

@ -44,7 +44,6 @@
<dimen name="prompt_service_inputs_padding">16dp</dimen> <dimen name="prompt_service_inputs_padding">16dp</dimen>
<dimen name="prompt_service_left_right_text_with_icon_padding">10dp</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_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_child_row_height">64dp</dimen>
<dimen name="remote_tab_group_row_height">26dp</dimen> <dimen name="remote_tab_group_row_height">26dp</dimen>
<dimen name="popup_width">400dp</dimen> <dimen name="popup_width">400dp</dimen>