diff --git a/actionbarsherlock/library/project.properties b/actionbarsherlock/library/project.properties index 05e464d69..5ca7d6247 100644 --- a/actionbarsherlock/library/project.properties +++ b/actionbarsherlock/library/project.properties @@ -9,4 +9,4 @@ android.library=true # Project target. -target=android-13 +target=android-14 diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java b/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java index fdb536138..7bfa09a88 100644 --- a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java +++ b/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java @@ -21,6 +21,7 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.support.v4.view.MenuItem; import android.support.v4.view.SubMenu; +import android.view.ActionProvider; import android.view.ContextMenu.ContextMenuInfo; import android.view.View; @@ -238,6 +239,8 @@ public class ActionMenuItem implements MenuItem { throw new UnsupportedOperationException(); } + // --- added automatically + public View getActionView() { return null; } @@ -246,4 +249,40 @@ public class ActionMenuItem implements MenuItem { public MenuItem setActionView(int resId) { throw new UnsupportedOperationException(); } + + @Override + public boolean collapseActionView() { + return false; + } + + @Override + public boolean expandActionView() { + return false; + } + + @Override + public ActionProvider getActionProvider() { + return null; + } + + @Override + public boolean isActionViewExpanded() { + return false; + } + + @Override + public android.view.MenuItem setActionProvider(ActionProvider arg0) { + return null; + } + + @Override + public android.view.MenuItem setOnActionExpandListener( + OnActionExpandListener arg0) { + return null; + } + + @Override + public android.view.MenuItem setShowAsActionFlags(int arg0) { + return null; + } } diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java b/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java index a2b1d24f0..60b9ee6b0 100644 --- a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java +++ b/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java @@ -23,12 +23,15 @@ import android.graphics.drawable.Drawable; import android.support.v4.view.MenuItem; import android.support.v4.view.SubMenu; import android.util.Log; +import android.view.ActionProvider; import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; import android.view.View; import android.view.ViewDebug; import android.widget.LinearLayout; +import com.actionbarsherlock.internal.view.menu.MenuView.ItemView; + /** * @hide */ @@ -573,4 +576,42 @@ public final class MenuItemImpl implements MenuItem { return null; } } + + // --- added automatically + + @Override + public boolean collapseActionView() { + return false; + } + + @Override + public boolean expandActionView() { + return false; + } + + @Override + public ActionProvider getActionProvider() { + return null; + } + + @Override + public boolean isActionViewExpanded() { + return false; + } + + @Override + public android.view.MenuItem setActionProvider(ActionProvider arg0) { + return null; + } + + @Override + public android.view.MenuItem setOnActionExpandListener( + OnActionExpandListener arg0) { + return null; + } + + @Override + public android.view.MenuItem setShowAsActionFlags(int arg0) { + return null; + } } diff --git a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java b/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java index 2ed1e548e..3fbdcbd71 100644 --- a/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java +++ b/actionbarsherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java @@ -21,8 +21,9 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.support.v4.view.MenuItem; import android.support.v4.view.SubMenu; -import android.view.View; +import android.view.ActionProvider; import android.view.ContextMenu.ContextMenuInfo; +import android.view.View; /** *
Interface for direct access to a previously created menu item.
@@ -312,4 +313,48 @@ public final class MenuItemWrapper implements MenuItem { mMenuItem.setVisible(visible); return this; } + + // --- added automatically + + @Override + public boolean collapseActionView() { + return false; + } + + + @Override + public boolean expandActionView() { + return false; + } + + + @Override + public ActionProvider getActionProvider() { + return null; + } + + + @Override + public boolean isActionViewExpanded() { + return false; + } + + + @Override + public android.view.MenuItem setActionProvider(ActionProvider arg0) { + return null; + } + + + @Override + public android.view.MenuItem setOnActionExpandListener( + OnActionExpandListener arg0) { + return null; + } + + + @Override + public android.view.MenuItem setShowAsActionFlags(int arg0) { + return null; + } } diff --git a/actionbarsherlock/samples/demos/.project b/actionbarsherlock/samples/demos/.project deleted file mode 100644 index 35b757909..000000000 --- a/actionbarsherlock/samples/demos/.project +++ /dev/null @@ -1,33 +0,0 @@ - -