diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-01-28 22:21:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-28 22:21:12 +0000 |
| commit | 6f704ff8785c7e565bcc12d3185cc20ca81afa0e (patch) | |
| tree | 69002e3e81b4aeaf2231954174f4853c794fc211 | |
| parent | dd55a4635be29de3fbcd94a8c248e2dddae96420 (diff) | |
| parent | 5203a2412ad64c1eb45bfdcd8801baf5dc1727ba (diff) | |
| download | sdk-6f704ff8785c7e565bcc12d3185cc20ca81afa0e.zip sdk-6f704ff8785c7e565bcc12d3185cc20ca81afa0e.tar.gz sdk-6f704ff8785c7e565bcc12d3185cc20ca81afa0e.tar.bz2 | |
Merge "Add AssetRepository to render params." into studio-1.2-dev
automerge: 5203a24
* commit '5203a2412ad64c1eb45bfdcd8801baf5dc1727ba':
Add AssetRepository to render params.
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderService.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderService.java index ffcb258..3b9e2fc 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderService.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderService.java @@ -24,6 +24,7 @@ import com.android.ide.common.api.Rect; import com.android.ide.common.rendering.HardwareConfigHelper; import com.android.ide.common.rendering.LayoutLibrary; import com.android.ide.common.rendering.RenderSecurityManager; +import com.android.ide.common.rendering.api.AssetRepository; import com.android.ide.common.rendering.api.Capability; import com.android.ide.common.rendering.api.DrawableParams; import com.android.ide.common.rendering.api.HardwareConfig; @@ -471,6 +472,7 @@ public class RenderService { params.setExtendedViewInfoMode(true); params.setLocale(mLocale.toLocaleId()); + params.setAssetRepository(new AssetRepository()); ManifestInfo manifestInfo = ManifestInfo.get(mProject); try { @@ -546,6 +548,7 @@ public class RenderService { DrawableParams params = new DrawableParams(drawableResourceValue, mProject, hardwareConfig, mResourceResolver, mProjectCallback, mMinSdkVersion, mTargetSdkVersion, mLogger); + params.setAssetRepository(new AssetRepository()); params.setForceNoDecor(); Result result = mLayoutLib.renderDrawable(params); if (result != null && result.isSuccess()) { @@ -619,6 +622,7 @@ public class RenderService { mLogger); params.setLayoutOnly(); params.setForceNoDecor(); + params.setAssetRepository(new AssetRepository()); RenderSession session = null; mProjectCallback.setLogger(mLogger); |