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

Commit 28873c1f authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

Fix layoutlib [DO NOT MERGE] 

Fix a NPE, and update an ICU method to return the right value as
required by DatePicker widget.

The cherry-pick differs slightly from the original to remove changes not
relevant to the current branch.

Bug: 11140701
Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf
(cherry-picked from 39e75835)
parent 4cf6286c

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

+15 −6
Original line number Diff line number Diff line
@@ -248,11 +248,16 @@ public abstract class RenderAction<T extends RenderParams> extends FrameworkReso 
     * The counterpart is {@link #setUp()}.

     */

    private void tearDown() {

        // The context may be null, if there was an error during init().

        if (mContext != null) {

            // Make sure to remove static references, otherwise we could not unload the lib

            mContext.disposeResources();

        }



        if (sCurrentContext != null) {

            // quit HandlerThread created during this session.

            HandlerThread_Delegate.cleanUp(sCurrentContext);

        }



        // clear the stored ViewConfiguration since the map is per density and not per context.

        ViewConfiguration_Accessor.clearConfigurations();
@@ -263,10 +268,14 @@ public abstract class RenderAction<T extends RenderParams> extends FrameworkReso 
        sCurrentContext = null;



        Bridge.setLog(null);

        if (mContext != null) {

            mContext.getRenderResources().setFrameworkResourceIdProvider(null);

            mContext.getRenderResources().setLogger(null);

        }



        mContext = null;

    }



    public static BridgeContext getCurrentContext() {

        return sCurrentContext;

    }

tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java

+4 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package libcore.icu;



import com.android.tools.layoutlib.annotations.LayoutlibDelegate;

import com.ibm.icu.text.DateTimePatternGenerator;

import com.ibm.icu.util.ULocale;



import java.util.Locale;
@@ -45,7 +47,8 @@ public class ICU_Delegate { 


    @LayoutlibDelegate

    /*package*/ static String getBestDateTimePattern(String skeleton, String localeName) {

        return "";            // TODO: check what the right value should be.

        return DateTimePatternGenerator.getInstance(new ULocale(localeName))

                .getBestPattern(skeleton);

    }



    @LayoutlibDelegate