diff options
| author | Raluca Sauciuc <ralucas@google.com> | 2015-07-15 21:47:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-15 21:47:08 +0000 |
| commit | 489ab4f623574b7c2266856cedfda9ea18b5317f (patch) | |
| tree | d8d8250a7cdbbc537bc7d36dfa691a37641ceb9b /designer | |
| parent | d0b63505975aa413ecc4c62519f247429cce34e7 (diff) | |
| parent | 5274178ef4d42eb5667d37602ac23cf7d1e1810f (diff) | |
| download | idea-489ab4f623574b7c2266856cedfda9ea18b5317f.tar.gz | |
Merge "Enable NlPreviewManager only if nele.enabled=true" into studio-1.4-dev
Diffstat (limited to 'designer')
| -rw-r--r-- | designer/src/com/android/tools/idea/uibuilder/editor/NlPreviewManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/designer/src/com/android/tools/idea/uibuilder/editor/NlPreviewManager.java b/designer/src/com/android/tools/idea/uibuilder/editor/NlPreviewManager.java index 131535363c7..3c5ed611c73 100644 --- a/designer/src/com/android/tools/idea/uibuilder/editor/NlPreviewManager.java +++ b/designer/src/com/android/tools/idea/uibuilder/editor/NlPreviewManager.java @@ -193,6 +193,10 @@ public class NlPreviewManager implements ProjectComponent { private boolean myRenderImmediately; private void processFileEditorChange(@Nullable final TextEditor newEditor) { + if (!RenderService.NELE_ENABLED) { + return; + } + if (myPendingShowComponent != null) { myPendingShowComponent.removeHierarchyListener(myHierarchyListener); myPendingShowComponent = null; |