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

Commit 848b2373 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "SystemUI: Set default blur effect to off"

parents a91d385d a21eb097

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

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class StatusBarWindowManager { 
        @Override

        public void onChange(boolean selfChange) {

            mKeyguardBlurEnabled = 1 == Settings.System.getInt(

                    mContext.getContentResolver(), Settings.System.BLUR_EFFECT_LOCKSCREEN, 1);

                    mContext.getContentResolver(), Settings.System.BLUR_EFFECT_LOCKSCREEN, 0);

        }

    };

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

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ public class VolumePanel extends Handler { 
        @Override

        public void onChange(boolean selfChange) {

            mBlurUiEnabled = 1 == Settings.System.getInt(

                    mContext.getContentResolver(), Settings.System.BLUR_EFFECT_VOLUMECONTROL, 1);

                    mContext.getContentResolver(), Settings.System.BLUR_EFFECT_VOLUMECONTROL, 0);

            setupVolumePanelBlur(mBlurUiEnabled);

        }

    };

policy/src/com/android/internal/policy/impl/GlobalActions.java

+1 −1
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
            params.apply(mAlert);



            int blurSetting = Settings.System.getInt( mContext.getContentResolver(),

                    Settings.System.BLUR_EFFECT_GLOBALACTION, 1);

                    Settings.System.BLUR_EFFECT_GLOBALACTION, 0);

            if( blurSetting == 1 ) {

                getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);

                getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);