Merge "Don't explicitly set the title's layout direction" (b06271db) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/PhoneWindow.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -2679,18 +2679,14 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		} else {
		mTitleView = (TextView) findViewById(R.id.title);
		if (mTitleView != null) {
		mTitleView.setLayoutDirection(mDecor.getLayoutDirection());
		if ((getLocalFeatures() & (1 << FEATURE_NO_TITLE)) != 0) {
		View titleContainer = findViewById(
		R.id.title_container);
		final View titleContainer = findViewById(R.id.title_container);
		if (titleContainer != null) {
		titleContainer.setVisibility(View.GONE);
		} else {
		mTitleView.setVisibility(View.GONE);
		}
		if (mContentParent instanceof FrameLayout) {
		((FrameLayout)mContentParent).setForeground(null);
		}
		mContentParent.setForeground(null);
		} else {
		mTitleView.setText(mTitle);
		}