Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1126422e authored by Xavier Ducrohet's avatar Xavier Ducrohet
Browse files

LayoutLib: update to the new API. 

Change-Id: Ice028933cd2270c81c3d17f7bef7c5a9d14bd802
parent b894f895

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java

+3 −3
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import static com.android.ide.common.rendering.api.Result.Status.SUCCESS; 


import com.android.ide.common.rendering.api.Capability;

import com.android.ide.common.rendering.api.LayoutLog;

import com.android.ide.common.rendering.api.RenderParams;

import com.android.ide.common.rendering.api.RenderSession;

import com.android.ide.common.rendering.api.Result;

import com.android.ide.common.rendering.api.SessionParams;

import com.android.layoutlib.bridge.android.BridgeAssetManager;

import com.android.layoutlib.bridge.impl.FontLoader;

import com.android.layoutlib.bridge.impl.RenderSessionImpl;
@@ -295,13 +295,13 @@ public final class Bridge extends com.android.ide.common.rendering.api.Bridge { 
     * Starts a layout session by inflating and rendering it. The method returns a

     * {@link RenderSession} on which further actions can be taken.

     *

     * @param params the {@link RenderParams} object with all the information necessary to create

     * @param params the {@link SessionParams} object with all the information necessary to create

     *           the scene.

     * @return a new {@link RenderSession} object that contains the result of the layout.

     * @since 5

     */

    @Override

    public RenderSession createSession(RenderParams params) {

    public RenderSession createSession(SessionParams params) {

        try {

            Result lastResult = SUCCESS.createResult();

            RenderSessionImpl scene = new RenderSessionImpl(params);

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java

+5 −4
Original line number Diff line number Diff line
@@ -34,10 +34,11 @@ import com.android.ide.common.rendering.api.RenderResources; 
import com.android.ide.common.rendering.api.RenderSession;

import com.android.ide.common.rendering.api.ResourceValue;

import com.android.ide.common.rendering.api.Result;

import com.android.ide.common.rendering.api.SessionParams;

import com.android.ide.common.rendering.api.ViewInfo;

import com.android.ide.common.rendering.api.RenderParams.RenderingMode;

import com.android.ide.common.rendering.api.RenderResources.FrameworkResourceIdProvider;

import com.android.ide.common.rendering.api.Result.Status;

import com.android.ide.common.rendering.api.SessionParams.RenderingMode;

import com.android.internal.util.XmlUtils;

import com.android.layoutlib.bridge.Bridge;

import com.android.layoutlib.bridge.android.BridgeContext;
@@ -109,7 +110,7 @@ public class RenderSessionImpl extends FrameworkResourceIdProvider { 
     */

    private static BridgeContext sCurrentContext = null;



    private final RenderParams mParams;

    private final SessionParams mParams;



    // scene state

    private RenderSession mScene;
@@ -151,9 +152,9 @@ public class RenderSessionImpl extends FrameworkResourceIdProvider { 
     *

     * @see LayoutBridge#createScene(com.android.layoutlib.api.SceneParams)

     */

    public RenderSessionImpl(RenderParams params) {

    public RenderSessionImpl(SessionParams params) {

        // copy the params.

        mParams = new RenderParams(params);

        mParams = new SessionParams(params);

    }



    /**