Skip to content
This repository has been archived by the owner on Apr 19, 2018. It is now read-only.

Commit

Permalink
Temporarily remove the use of IcsLinearLayout for action items. Refs #…
Browse files Browse the repository at this point in the history
  • Loading branch information
JakeWharton committed Feb 17, 2012
1 parent a2538db commit 07e3f00
Showing 1 changed file with 6 additions and 7 deletions.
Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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;
Expand All @@ -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;
}

Expand Down

0 comments on commit 07e3f00

Please sign in to comment.