From 07e3f0080f257bdbdd0fbc167a6731903f30b01c Mon Sep 17 00:00:00 2001
From: Jake Wharton <jakewharton@gmail.com>
Date: Thu, 16 Feb 2012 22:05:16 -0500
Subject: [PATCH] Temporarily remove the use of IcsLinearLayout for action
 items. Refs #272.

---
 .../internal/view/menu/ActionMenuView.java          | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java b/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
index 63c5abe51..0283ac27c 100644
--- a/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
+++ b/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
@@ -15,8 +15,6 @@
  */
 package com.actionbarsherlock.internal.view.menu;
 
-import com.actionbarsherlock.internal.widget.IcsLinearLayout;
-
 import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Build;
@@ -25,11 +23,12 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
+import android.widget.LinearLayout;
 
 /**
  * @hide
  */
-public class ActionMenuView extends IcsLinearLayout implements MenuBuilder.ItemInvoker, MenuView {
+public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvoker, MenuView {
     //UNUSED private static final String TAG = "ActionMenuView";
 
     static final int MIN_CELL_SIZE = 56; // dips
@@ -368,7 +367,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 
         final int childCount = getChildCount();
         final int midVertical = (top + bottom) / 2;
-        final int dividerWidth = getDividerWidth();
+        final int dividerWidth = 0;//getDividerWidth();
         int overflowWidth = 0;
         //UNUSED int nonOverflowWidth = 0;
         int nonOverflowCount = 0;
@@ -501,7 +500,7 @@ public void initialize(MenuBuilder menu) {
         mMenu = menu;
     }
 
-    @Override
+    //@Override
     protected boolean hasDividerBeforeChildAt(int childIndex) {
         final View childBefore = getChildAt(childIndex - 1);
         final View child = getChildAt(childIndex);
@@ -524,7 +523,7 @@ public interface ActionMenuChildView {
         public boolean needsDividerAfter();
     }
 
-    public static class LayoutParams extends IcsLinearLayout.LayoutParams {
+    public static class LayoutParams extends LinearLayout.LayoutParams {
         public boolean isOverflowButton;
         public int cellsUsed;
         public int extraPixels;
@@ -538,7 +537,7 @@ public LayoutParams(Context c, AttributeSet attrs) {
         }
 
         public LayoutParams(LayoutParams other) {
-            super((IcsLinearLayout.LayoutParams) other);
+            super((LinearLayout.LayoutParams) other);
             isOverflowButton = other.isOverflowButton;
         }