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

am 8d95b500: Merge "Action bar rendering in layoutlib"

Browse Source 
* commit '8d95b5009ce5592f55a9487536fa640724dc316b':
  Action bar rendering in layoutlib
This commit is contained in:
Deepanshu Gupta
2014-04-14 23:12:03 +00:00
committed by Android Git Automerger
parent 68fe45839a 8d95b5009c
commit 2f202be72e
12 changed files with 457 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/ShareActionProvider.java
View File

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

15
core/java/com/android/internal/app/WindowDecorActionBar.java
View File

@@ -170,6 +170,15 @@ public class WindowDecorActionBar extends ActionBar {
init(dialog.getWindow().getDecorView());
}
/**
* Only for edit mode.
* @hide
*/
public WindowDecorActionBar(View layout) {
assert layout.isInEditMode();
init(layout);
}
private void init(View decor) {
mOverlayLayout = (ActionBarOverlayLayout) decor.findViewById(
com.android.internal.R.id.action_bar_overlay_layout);
@@ -559,8 +568,8 @@ public class WindowDecorActionBar extends ActionBar {
return;
}
final FragmentTransaction trans = mActivity.getFragmentManager().beginTransaction()
.disallowAddToBackStack();
final FragmentTransaction trans = mActionView.isInEditMode() ? null :
mActivity.getFragmentManager().beginTransaction().disallowAddToBackStack();
if (mSelectedTab == tab) {
if (mSelectedTab != null) {
@@ -578,7 +587,7 @@ public class WindowDecorActionBar extends ActionBar {
}
}
if (!trans.isEmpty()) {
if (trans != null && !trans.isEmpty()) {
trans.commit();
}
}