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

Commit 4c90d9ae authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am bf291475: am e32f9c88: Merge changes I29f7abe6,I6c831467 into mnc-dev 

* commit 'bf291475':
  Fix Paint_Delegate.native_getRunAdvance()
  Add a default PackageManager to BridgeContext.
parents 18a5e88c bf291475

tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1171,8 +1171,9 @@ public class Paint_Delegate { 
        float[] advances = new float[count];

        float[] advances = new float[count];

        native_getTextRunAdvances(nativePaint, nativeTypeface, text, start, count,

        native_getTextRunAdvances(nativePaint, nativeTypeface, text, start, count,

                contextStart, contextEnd - contextStart, isRtl, advances, 0);

                contextStart, contextEnd - contextStart, isRtl, advances, 0);

        int startOffset = offset - start;  // offset from start.

        float sum = 0;

        float sum = 0;

        for (int i = 0; i < offset; i++) {

        for (int i = 0; i < startOffset; i++) {

            sum += advances[i];

            sum += advances[i];

        }

        }

        return sum;

        return sum;

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

+9 −6
Original line number Original line Diff line number Diff line
@@ -149,6 +149,7 @@ public final class BridgeContext extends Context { 
    private SharedPreferences mSharedPreferences;

    private SharedPreferences mSharedPreferences;

    private ClassLoader mClassLoader;

    private ClassLoader mClassLoader;

    private IBinder mBinder;

    private IBinder mBinder;

    private PackageManager mPackageManager;









    /**

    /**
@@ -904,6 +905,14 @@ public final class BridgeContext extends Context { 
        return mApplicationInfo.packageName;

        return mApplicationInfo.packageName;

    }

    }





    @Override

    public PackageManager getPackageManager() {

        if (mPackageManager == null) {

            mPackageManager = new BridgePackageManager();

        }

        return mPackageManager;

    }



    // ------------- private new methods

    // ------------- private new methods





    /**

    /**
@@ -1365,12 +1374,6 @@ public final class BridgeContext extends Context { 
        return null;

        return null;

    }

    }





    @Override

    public PackageManager getPackageManager() {

        // pass

        return null;

    }



    @Override

    @Override

    public String getBasePackageName() {

    public String getBasePackageName() {

        // pass

        // pass

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

0 → 100644
+769 −0

File added.

Preview size limit exceeded, changes collapsed.