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

Commit 900c0e8c authored by Yash Garg's avatar Yash Garg 💬
Browse files

Merge branch '4719-r-fix-theming' into 'v1-r' 

properly set fonts and icons on keyguard when changing styles

See merge request e/os/android_frameworks_base!120
parents c4d4ca3c a6887581

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+16 −4
Original line number Diff line number Diff line
@@ -729,6 +729,22 @@ public class NotificationPanelViewController extends PanelViewController { 
                R.layout.keyguard_status_view, mView, false);

        mView.addView(mKeyguardStatusView, index);



        index = mView.indexOfChild(mKeyguardStatusBar);

        mView.removeView(mKeyguardStatusBar);

        mKeyguardStatusBar = (KeyguardStatusBarView) mInjectionInflationController

                .injectable(LayoutInflater.from(mView.getContext())).inflate(

                        R.layout.keyguard_status_bar,

                        mView,

                        false);

        mView.addView(mKeyguardStatusBar, index);



        if (mQs instanceof QSFragment) {

            mKeyguardStatusBar.setQSPanel(((QSFragment) mQs).getQsPanel());

        }

        mKeyguardStatusBar.setAlpha(mBarState == StatusBarState.KEYGUARD ? 0f : 1f);

        mKeyguardStatusBar.setVisibility(

                mBarState == StatusBarState.KEYGUARD ? View.VISIBLE : View.INVISIBLE);



        // Re-associate the clock container with the keyguard clock switch.

        mBigClockContainer.removeAllViews();

        KeyguardClockSwitch keyguardClockSwitch = mView.findViewById(R.id.keyguard_clock_container);
@@ -748,10 +764,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        mStatusBarStateListener.onDozeAmountChanged(mStatusBarStateController.getDozeAmount(),

                mStatusBarStateController.getInterpolatedDozeAmount());



        if (mKeyguardStatusBar != null) {

            mKeyguardStatusBar.onThemeChanged();

        }



        setKeyguardStatusViewVisibility(mBarState, false, false);

        setKeyguardBottomAreaVisibility(mBarState, false);

        if (mOnReinflationListener != null) {