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

Commit 58434898 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Lazily reinflate volume dialog after config change"

parents 60538cce b1042009

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+7 −2
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ public class VolumeDialogImpl implements VolumeDialog { 
    private SafetyWarningDialog mSafetyWarning;

    private boolean mHovering = false;

    private boolean mShowActiveStreamOnly;

    private boolean mConfigChanged = false;



    public VolumeDialogImpl(Context context) {

        mContext = new ContextThemeWrapper(context, com.android.systemui.R.style.qs_theme);
@@ -551,6 +552,11 @@ public class VolumeDialogImpl implements VolumeDialog { 
        rescheduleTimeoutH();

        mShowing = true;



        if (mConfigChanged) {

            initDialog();

            mConfigurableTexts.update();

            mConfigChanged = false;

        }

        initSettingsH();

        mDialog.show();

        Events.writeEvent(mContext, Events.EVENT_SHOW_DIALOG, reason, mKeyguard.isKeyguardLocked());
@@ -1102,8 +1108,7 @@ public class VolumeDialogImpl implements VolumeDialog { 
        @Override

        public void onConfigurationChanged() {

            mDialog.dismiss();

            initDialog();

            mConfigurableTexts.update();

            mConfigChanged = true;

        }



        @Override