Fix bug #6140391 Make RTL awareness as an opt-in into the AndroidManifest (59dfce8b) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −6

core/java/android/content/pm/ApplicationInfo.java

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -290,6 +290,17 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
	*/		*/
	public static final int FLAG_STOPPED = 1<<21;		public static final int FLAG_STOPPED = 1<<21;

			/**
			* Value for {@link #flags}: true when the application is willing to support
			* RTL (right to left). All activities will inherit this value.
			*
			* Set from the {@link android.R.attr#supportsRtl} attribute in the
			* activity's manifest.
			*
			* Default value is false (no support for RTL).
			*/
			public static final int FLAG_SUPPORTS_RTL = 1<<22;

	/**		/**
	* Value for {@link #flags}: Set to true if the application has been		* Value for {@link #flags}: Set to true if the application has been
	* installed using the forward lock option.		* installed using the forward lock option.
	@@ -466,9 +477,18 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
	if (uiOptions != 0) {		if (uiOptions != 0) {
	pw.println(prefix + "uiOptions=0x" + Integer.toHexString(uiOptions));		pw.println(prefix + "uiOptions=0x" + Integer.toHexString(uiOptions));
	}		}
			pw.println(prefix + "supportsRtl=" + (hasRtlSupport() ? "true" : "false"));
	super.dumpBack(pw, prefix);		super.dumpBack(pw, prefix);
	}		}

			/**
			* @return true if "supportsRtl" has been set to true in the AndroidManifest
			* @hide
			*/
			public boolean hasRtlSupport() {
			return (flags & FLAG_SUPPORTS_RTL) == FLAG_SUPPORTS_RTL;
			}

	public static class DisplayNameComparator		public static class DisplayNameComparator
	implements Comparator<ApplicationInfo> {		implements Comparator<ApplicationInfo> {
	public DisplayNameComparator(PackageManager pm) {		public DisplayNameComparator(PackageManager pm) {

core/java/android/content/pm/PackageParser.java

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1761,6 +1761,12 @@ public class PackageParser {
	ai.flags \|= ApplicationInfo.FLAG_LARGE_HEAP;		ai.flags \|= ApplicationInfo.FLAG_LARGE_HEAP;
	}		}

			if (sa.getBoolean(
			com.android.internal.R.styleable.AndroidManifestApplication_supportsRtl,
			false /* default is no RTL support*/)) {
			ai.flags \|= ApplicationInfo.FLAG_SUPPORTS_RTL;
			}

	String str;		String str;
	str = sa.getNonConfigurationString(		str = sa.getNonConfigurationString(
	com.android.internal.R.styleable.AndroidManifestApplication_permission, 0);		com.android.internal.R.styleable.AndroidManifestApplication_permission, 0);

core/java/android/view/View.java

+70 −56

Original line number	Original line	Diff line number	Diff line
	@@ -9864,6 +9864,13 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
	public void onScreenStateChanged(int screenState) {		public void onScreenStateChanged(int screenState) {
	}		}

			/**
			* Return true if the application tag in the AndroidManifest has set "supportRtl" to true
			*/
			private boolean hasRtlSupport() {
			return mContext.getApplicationInfo().hasRtlSupport();
			}

	/**		/**
	* Resolve and cache the layout direction. LTR is set initially. This is implicitly supposing		* Resolve and cache the layout direction. LTR is set initially. This is implicitly supposing
	* that the parent directionality can and will be resolved before its children.		* that the parent directionality can and will be resolved before its children.
	@@ -9873,6 +9880,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
	// Clear any previous layout direction resolution		// Clear any previous layout direction resolution
	mPrivateFlags2 &= ~LAYOUT_DIRECTION_RESOLVED_MASK;		mPrivateFlags2 &= ~LAYOUT_DIRECTION_RESOLVED_MASK;

			if (hasRtlSupport()) {
	// Set resolved depending on layout direction		// Set resolved depending on layout direction
	switch (getLayoutDirection()) {		switch (getLayoutDirection()) {
	case LAYOUT_DIRECTION_INHERIT:		case LAYOUT_DIRECTION_INHERIT:
	@@ -9898,6 +9906,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
	default:		default:
	// Nothing to do, LTR by default		// Nothing to do, LTR by default
	}		}
			}

	// Set to resolved		// Set to resolved
	mPrivateFlags2 \|= LAYOUT_DIRECTION_RESOLVED;		mPrivateFlags2 \|= LAYOUT_DIRECTION_RESOLVED;
	@@ -14603,6 +14612,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
	// Reset any previous text direction resolution		// Reset any previous text direction resolution
	mPrivateFlags2 &= ~(TEXT_DIRECTION_RESOLVED \| TEXT_DIRECTION_RESOLVED_MASK);		mPrivateFlags2 &= ~(TEXT_DIRECTION_RESOLVED \| TEXT_DIRECTION_RESOLVED_MASK);

			if (hasRtlSupport()) {
	// Set resolved text direction flag depending on text direction flag		// Set resolved text direction flag depending on text direction flag
	final int textDirection = getTextDirection();		final int textDirection = getTextDirection();
	switch(textDirection) {		switch(textDirection) {
	@@ -14642,6 +14652,10 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
	// Default resolved direction is "first strong" heuristic		// Default resolved direction is "first strong" heuristic
	mPrivateFlags2 \|= TEXT_DIRECTION_RESOLVED_DEFAULT;		mPrivateFlags2 \|= TEXT_DIRECTION_RESOLVED_DEFAULT;
	}		}
			} else {
			// Default resolved direction is "first strong" heuristic
			mPrivateFlags2 \|= TEXT_DIRECTION_RESOLVED_DEFAULT;
			}

	// Set to resolved		// Set to resolved
	mPrivateFlags2 \|= TEXT_DIRECTION_RESOLVED;		mPrivateFlags2 \|= TEXT_DIRECTION_RESOLVED;

core/res/res/values/attrs_manifest.xml

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -843,6 +843,9 @@
	@hide -->		@hide -->
	<attr name="cantSaveState" format="boolean" />		<attr name="cantSaveState" format="boolean" />
	<attr name="uiOptions" />		<attr name="uiOptions" />
			<!-- Declare that your application will be able to deal with RTL (right to left) layouts.
			If set to false (default value), your application will not care about RTL layouts. -->
			<attr name="supportsRtl" format="boolean" />
	</declare-styleable>		</declare-styleable>

	<!-- The <code>permission</code> tag declares a security permission that can be		<!-- The <code>permission</code> tag declares a security permission that can be

Original line number	Original line	Diff line number	Diff line
	@@ -596,7 +596,7 @@ package android {
	field public static final int layerType = 16843604; // 0x1010354		field public static final int layerType = 16843604; // 0x1010354
	field public static final int layout = 16842994; // 0x10100f2		field public static final int layout = 16842994; // 0x10100f2
	field public static final int layoutAnimation = 16842988; // 0x10100ec		field public static final int layoutAnimation = 16842988; // 0x10100ec
	field public static final int layoutDirection = 16843689; // 0x10103a9		field public static final int layoutDirection = 16843690; // 0x10103aa
	field public static final int layout_above = 16843140; // 0x1010184		field public static final int layout_above = 16843140; // 0x1010184
	field public static final int layout_alignBaseline = 16843142; // 0x1010186		field public static final int layout_alignBaseline = 16843142; // 0x1010186
	field public static final int layout_alignBottom = 16843146; // 0x101018a		field public static final int layout_alignBottom = 16843146; // 0x101018a
	@@ -618,10 +618,10 @@ package android {
	field public static final int layout_height = 16842997; // 0x10100f5		field public static final int layout_height = 16842997; // 0x10100f5
	field public static final int layout_margin = 16842998; // 0x10100f6		field public static final int layout_margin = 16842998; // 0x10100f6
	field public static final int layout_marginBottom = 16843002; // 0x10100fa		field public static final int layout_marginBottom = 16843002; // 0x10100fa
	field public static final int layout_marginEnd = 16843693; // 0x10103ad		field public static final int layout_marginEnd = 16843694; // 0x10103ae
	field public static final int layout_marginLeft = 16842999; // 0x10100f7		field public static final int layout_marginLeft = 16842999; // 0x10100f7
	field public static final int layout_marginRight = 16843001; // 0x10100f9		field public static final int layout_marginRight = 16843001; // 0x10100f9
	field public static final int layout_marginStart = 16843692; // 0x10103ac		field public static final int layout_marginStart = 16843693; // 0x10103ad
	field public static final int layout_marginTop = 16843000; // 0x10100f8		field public static final int layout_marginTop = 16843000; // 0x10100f8
	field public static final int layout_row = 16843643; // 0x101037b		field public static final int layout_row = 16843643; // 0x101037b
	field public static final int layout_rowSpan = 16843644; // 0x101037c		field public static final int layout_rowSpan = 16843644; // 0x101037c
	@@ -717,10 +717,10 @@ package android {
	field public static final int packageNames = 16843649; // 0x1010381		field public static final int packageNames = 16843649; // 0x1010381
	field public static final int padding = 16842965; // 0x10100d5		field public static final int padding = 16842965; // 0x10100d5
	field public static final int paddingBottom = 16842969; // 0x10100d9		field public static final int paddingBottom = 16842969; // 0x10100d9
	field public static final int paddingEnd = 16843691; // 0x10103ab		field public static final int paddingEnd = 16843692; // 0x10103ac
	field public static final int paddingLeft = 16842966; // 0x10100d6		field public static final int paddingLeft = 16842966; // 0x10100d6
	field public static final int paddingRight = 16842968; // 0x10100d8		field public static final int paddingRight = 16842968; // 0x10100d8
	field public static final int paddingStart = 16843690; // 0x10103aa		field public static final int paddingStart = 16843691; // 0x10103ab
	field public static final int paddingTop = 16842967; // 0x10100d7		field public static final int paddingTop = 16842967; // 0x10100d7
	field public static final int panelBackground = 16842846; // 0x101005e		field public static final int panelBackground = 16842846; // 0x101005e
	field public static final int panelColorBackground = 16842849; // 0x1010061		field public static final int panelColorBackground = 16842849; // 0x1010061
	@@ -931,6 +931,7 @@ package android {
	field public static final int summaryColumn = 16843426; // 0x10102a2		field public static final int summaryColumn = 16843426; // 0x10102a2
	field public static final int summaryOff = 16843248; // 0x10101f0		field public static final int summaryOff = 16843248; // 0x10101f0
	field public static final int summaryOn = 16843247; // 0x10101ef		field public static final int summaryOn = 16843247; // 0x10101ef
			field public static final int supportsRtl = 16843688; // 0x10103a8
	field public static final int supportsUploading = 16843419; // 0x101029b		field public static final int supportsUploading = 16843419; // 0x101029b
	field public static final int switchMinWidth = 16843632; // 0x1010370		field public static final int switchMinWidth = 16843632; // 0x1010370
	field public static final int switchPadding = 16843633; // 0x1010371		field public static final int switchPadding = 16843633; // 0x1010371
	@@ -1000,7 +1001,7 @@ package android {
	field public static final int textColorTertiary = 16843282; // 0x1010212		field public static final int textColorTertiary = 16843282; // 0x1010212