diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-04-14 23:07:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-14 23:07:30 +0000 |
| commit | 8d95b5009ce5592f55a9487536fa640724dc316b (patch) | |
| tree | 353b2872bf4b36cba754e5a44436f6a2a33a395a /core/java/android/widget | |
| parent | 111db01a2668b7a1ec256a4166c322db061d1ddd (diff) | |
| parent | 14bf0cef7eeed572a67c29a328581afac4decc20 (diff) | |
| download | frameworks_base-8d95b5009ce5592f55a9487536fa640724dc316b.zip frameworks_base-8d95b5009ce5592f55a9487536fa640724dc316b.tar.gz frameworks_base-8d95b5009ce5592f55a9487536fa640724dc316b.tar.bz2 | |
Merge "Action bar rendering in layoutlib"
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/ShareActionProvider.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/widget/ShareActionProvider.java b/core/java/android/widget/ShareActionProvider.java index 64a1574..cde8080 100644 --- a/core/java/android/widget/ShareActionProvider.java +++ b/core/java/android/widget/ShareActionProvider.java @@ -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(); |