Snap for 6952272 from 4af61d89cfec718562c57feedd269772e1df4cef to rvc-qpr2-release (c100df4b) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/Typeface.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -327,7 +327,7 @@ public class Typeface {
		* 1) Create Typeface from ttf file.
		* <pre>
		* <code>
		* Typeface.Builder buidler = new Typeface.Builder("your_font_file.ttf");
		* Typeface.Builder builder = new Typeface.Builder("your_font_file.ttf");
		* Typeface typeface = builder.build();
		* </code>
		* </pre>
		@@ -335,7 +335,7 @@ public class Typeface {
		* 2) Create Typeface from ttc file in assets directory.
		* <pre>
		* <code>
		* Typeface.Builder buidler = new Typeface.Builder(getAssets(), "your_font_file.ttc");
		* Typeface.Builder builder = new Typeface.Builder(getAssets(), "your_font_file.ttc");
		* builder.setTtcIndex(2); // Set index of font collection.
		* Typeface typeface = builder.build();
		* </code>
		@@ -344,7 +344,7 @@ public class Typeface {
		* 3) Create Typeface with variation settings.
		* <pre>
		* <code>
		* Typeface.Builder buidler = new Typeface.Builder("your_font_file.ttf");
		* Typeface.Builder builder = new Typeface.Builder("your_font_file.ttf");
		* builder.setFontVariationSettings("'wght' 700, 'slnt' 20, 'ital' 1");
		* builder.setWeight(700); // Tell the system that this is a bold font.
		* builder.setItalic(true); // Tell the system that this is an italic style font.

+9 −0

Original line number	Diff line number	Diff line
		@@ -2410,6 +2410,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		wm = (WindowManager) context.getSystemService(WINDOW_SERVICE);
		view = win.getDecorView();

		// Ignore to show splash screen if the decorView is not opaque.
		if (!view.isOpaque()) {
		if (DEBUG_SPLASH_SCREEN) {
		Slog.d(TAG, "addSplashScreen: the view of " + packageName
		+ " is not opaque, cancel it");
		}
		return null;
		}

		if (DEBUG_SPLASH_SCREEN) Slog.d(TAG, "Adding splash screen window for "
		+ packageName + " / " + appToken + ": " + (view.getParent() != null ? view : null));