am e1a08110: am b91f34bf: am 4c90d9ae: am bf291475: am e32f9c88: Merge changes... (385c3b64) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1171,8 +1171,9 @@ public class Paint_Delegate {
		float[] advances = new float[count];
		native_getTextRunAdvances(nativePaint, nativeTypeface, text, start, count,
		contextStart, contextEnd - contextStart, isRtl, advances, 0);
		int startOffset = offset - start; // offset from start.
		float sum = 0;
		for (int i = 0; i < offset; i++) {
		for (int i = 0; i < startOffset; i++) {
		sum += advances[i];
		}
		return sum;

+9 −6

Original line number	Diff line number	Diff line
		@@ -149,6 +149,7 @@ public final class BridgeContext extends Context {
		private SharedPreferences mSharedPreferences;
		private ClassLoader mClassLoader;
		private IBinder mBinder;
		private PackageManager mPackageManager;


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

		@Override
		public PackageManager getPackageManager() {
		if (mPackageManager == null) {
		mPackageManager = new BridgePackageManager();
		}
		return mPackageManager;
		}

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

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

		@Override
		public PackageManager getPackageManager() {
		// pass
		return null;
		}

		@Override
		public String getBasePackageName() {
		// pass

0 → 100644

+769 −0

File added.

Preview size limit exceeded, changes collapsed.