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

Commit 891c9ee7 authored by Alan Viverette's avatar Alan Viverette
Browse files

Don't explicitly set the title's layout direction 

The decor view may not be attached to the ViewRootImpl yet, so we can't
resolve the layout direction. Also, cleans up an instanceof check for
clearing the foreground since every class now supports foreground.

Bug: 26459947
Change-Id: I261661338dbaad6cc971ec7ae6875f514ecfbcde
parent 5724fe9d

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);

                    }