am 706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev

* commit '706a8699008ce416a7fbd9a4215726fdb00ee803':
  Make MediaRouter UI more robust around route count changes
This commit is contained in:
Adam Powell
2012-06-18 10:34:29 -07:00
committed by Android Git Automerger
5 changed files with 106 additions and 23 deletions

View File

@ -589,9 +589,17 @@ public final class MenuItemImpl implements MenuItem {
}
public MenuItem setActionProvider(ActionProvider actionProvider) {
if (mActionProvider != null) {
mActionProvider.setVisibilityListener(null);
}
mActionView = null;
mActionProvider = actionProvider;
mMenu.onItemsChanged(true); // Measurement can be changed
mActionProvider.setVisibilityListener(new ActionProvider.VisibilityListener() {
@Override public void onActionProviderVisibilityChanged(boolean isVisible) {
mMenu.onItemVisibleChanged(MenuItemImpl.this);
}
});
return this;
}