am a5461ebf: resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev (8e015b7b) · Commits · e / os / android_frameworks_base

core/java/android/widget/ShareActionProvider.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -161,9 +161,11 @@ public class ShareActionProvider extends ActionProvider {
	@Override		@Override
	public View onCreateActionView() {		public View onCreateActionView() {
	// Create the view and set its data model.		// Create the view and set its data model.
	ActivityChooserModel dataModel = ActivityChooserModel.get(mContext, mShareHistoryFileName);
	ActivityChooserView activityChooserView = new ActivityChooserView(mContext);		ActivityChooserView activityChooserView = new ActivityChooserView(mContext);
			if (!activityChooserView.isInEditMode()) {
			ActivityChooserModel dataModel = ActivityChooserModel.get(mContext, mShareHistoryFileName);
	activityChooserView.setActivityChooserModel(dataModel);		activityChooserView.setActivityChooserModel(dataModel);
			}

	// Lookup and set the expand action icon.		// Lookup and set the expand action icon.
	TypedValue outTypedValue = new TypedValue();		TypedValue outTypedValue = new TypedValue();

+12 −3

Original line number	Original line	Diff line number	Diff line
	@@ -162,6 +162,15 @@ public class ActionBarImpl extends ActionBar {
	init(dialog.getWindow().getDecorView());		init(dialog.getWindow().getDecorView());
	}		}

			/**
			* Only for edit mode.
			* @hide
			*/
			public ActionBarImpl(View layout) {
			assert layout.isInEditMode();
			init(layout);
			}

	private void init(View decor) {		private void init(View decor) {
	mContext = decor.getContext();		mContext = decor.getContext();
	mOverlayLayout = (ActionBarOverlayLayout) decor.findViewById(		mOverlayLayout = (ActionBarOverlayLayout) decor.findViewById(
	@@ -552,8 +561,8 @@ public class ActionBarImpl extends ActionBar {
	return;		return;
	}		}

	final FragmentTransaction trans = mActivity.getFragmentManager().beginTransaction()		final FragmentTransaction trans = mActionView.isInEditMode() ? null :
	.disallowAddToBackStack();		mActivity.getFragmentManager().beginTransaction().disallowAddToBackStack();

	if (mSelectedTab == tab) {		if (mSelectedTab == tab) {
	if (mSelectedTab != null) {		if (mSelectedTab != null) {
	@@ -571,7 +580,7 @@ public class ActionBarImpl extends ActionBar {
	}		}
	}		}

	if (!trans.isEmpty()) {		if (trans != null && !trans.isEmpty()) {
	trans.commit();		trans.commit();
	}		}
	}		}

+3 −4

Original line number	Original line	Diff line number	Diff line
	<?xml version="1.0" encoding="utf-8"?>		<?xml version="1.0" encoding="utf-8"?>
	<merge xmlns:android="http://schemas.android.com/apk/res/android">		<merge xmlns:android="http://schemas.android.com/apk/res/android">
	<include layout="@android:layout/action_bar_home" />
	<TextView		<include layout="@android:layout/screen_action_bar" />
	android:layout_width="wrap_content"
	android:layout_height="wrap_content"/>
	</merge>		</merge>

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -211,7 +211,8 @@ public final class Bridge extends com.android.ide.common.rendering.api.Bridge {
	Capability.ANIMATED_VIEW_MANIPULATION,		Capability.ANIMATED_VIEW_MANIPULATION,
	Capability.ADAPTER_BINDING,		Capability.ADAPTER_BINDING,
	Capability.EXTENDED_VIEWINFO,		Capability.EXTENDED_VIEWINFO,
	Capability.FIXED_SCALABLE_NINE_PATCH);		Capability.FIXED_SCALABLE_NINE_PATCH,
			Capability.ACTION_BAR);


	BridgeAssetManager.initSystem();		BridgeAssetManager.initSystem();

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -63,6 +63,11 @@ public class BridgeRenderSession extends RenderSession {
	return mSession.getViewInfos();		return mSession.getViewInfos();
	}		}

			@Override
			public List<ViewInfo> getSystemRootViews() {
			return mSession.getSystemViewInfos();
			}

	@Override		@Override
	public Map<String, String> getDefaultProperties(Object viewObject) {		public Map<String, String> getDefaultProperties(Object viewObject) {
	return mSession.getDefaultProperties(viewObject);		return mSession.getDefaultProperties(viewObject);