Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a51ac1bd: am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]

Browse Source 
* commit 'a51ac1bd065904ba7102d1b1565b4a47d7cbcb4a':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-05-13 02:00:23 +00:00
committed by Android Git Automerger
parent c7a2737123 a51ac1bd06
commit 0fef2d24c0
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/ActionBarLayout.java
View File

@@ -23,8 +23,10 @@ import com.android.ide.common.rendering.api.ActionBarCallback.HomeButtonStyle;
import com.android.ide.common.rendering.api.RenderResources;
import com.android.ide.common.rendering.api.ResourceValue;
import com.android.ide.common.rendering.api.SessionParams;
import com.android.ide.common.rendering.api.SystemViewCookie;
import com.android.internal.R;
import com.android.internal.app.ActionBarImpl;
import com.android.internal.util.Predicate;
import com.android.internal.view.menu.MenuBuilder;
import com.android.internal.view.menu.MenuBuilderAccessor;
import com.android.internal.view.menu.MenuItemImpl;
@@ -57,6 +59,8 @@ import android.widget.RelativeLayout;
import java.util.ArrayList;
import static com.android.ide.common.rendering.api.SystemViewCookie.ACTION_BAR_OVERFLOW;
/**
* A layout representing the action bar.
*/
@@ -166,10 +170,33 @@ public class ActionBarLayout extends LinearLayout {
if (mActionBarView != null) {
// Set action bar to be split, if needed.
mActionBarView.setSplitView((ActionBarContainer) findViewById(R.id.split_action_bar));
ActionBarContainer splitView = (ActionBarContainer) findViewById(R.id.split_action_bar);
mActionBarView.setSplitView(splitView);
mActionBarView.setSplitActionBar(mSplit);
inflateMenus();
// Find if the Overflow Menu Button (the three dots) exists. If yes,
// add the view cookie.
Predicate<View> overflowMenuButtonTest = new Predicate<View>() {
@Override
public boolean apply(View view) {
return view.getClass().getName()
.equals("android.widget.ActionMenuPresenter$OverflowMenuButton");
}
};
View overflowMenu = null;
if (mSplit) {
if (splitView != null) {
overflowMenu = splitView.findViewByPredicate(overflowMenuButtonTest);
}
}
else {
overflowMenu = mActionBarView.findViewByPredicate(overflowMenuButtonTest);
}
if (overflowMenu != null) {
mBridgeContext.addViewKey(overflowMenu, new SystemViewCookie(ACTION_BAR_OVERFLOW));
}
}
}