Fix for systemUI/Keygurad issues. (b6b95fdf) · Commits · e / os / android_frameworks_base

packages/Keyguard/src/com/android/keyguard/CarrierText.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ public class CarrierText extends LinearLayout {
		@Override
		protected void onFinishInflate() {
		super.onFinishInflate();
		mSeparator = getResources().getString(com.android.internal.R.string.kg_text_message_separator);
		mSeparator = getResources().getString(R.string.kg_text_message_separator);
		int[] operatorNameId = {R.id.carrier1, R.id.carrier2, R.id.carrier3};
		int[] operatorSepId = {R.id.carrier_divider1, R.id.carrier_divider2};
		final boolean screenOn = KeyguardUpdateMonitor.getInstance(mContext).isScreenOn();

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -2398,9 +2398,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mStatusBarWindowManager.setStatusBarExpanded(true);
		mStatusBarView.setFocusable(false);

		if (!force) {
		visibilityChanged(true);
		}
		mWaitingForKeyguardExit = false;
		disable(mDisabledUnmodified, !force /* animate */);
		setInteracting(StatusBarManager.WINDOW_STATUS_BAR, true);

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

+1 −29

Original line number	Diff line number	Diff line
		@@ -107,20 +107,6 @@ public class StatusBarWindowManager {
		mStatusBarView = statusBarView;
		mBarHeight = barHeight;
		mWindowManager.addView(mStatusBarView, mLp);

		Display display = mWindowManager.getDefaultDisplay();
		Point xy = new Point();
		display.getRealSize(xy);
		mKeyguardBlur = new BlurLayer(mFxSession, xy.x, xy.y, "KeyGuard");
		if (mKeyguardBlur != null) {
		mKeyguardBlur.setLayer(mStatusBarLayer -2);
		}

		mKeyguardBlurSettingObserver.onChange(true);
		mContext.getContentResolver().registerContentObserver(
		Settings.System.getUriFor(Settings.System.BLUR_EFFECT_LOCKSCREEN), false,
		mKeyguardBlurSettingObserver);

		mLpChanged = new WindowManager.LayoutParams();
		mLpChanged.copyFrom(mLp);
		}
		@@ -135,23 +121,9 @@ public class StatusBarWindowManager {

		private void applyKeyguardFlags(State state) {
		if (state.keyguardShowing) {
		mLp.privateFlags \|= WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;
		if (mKeyguardBlurEnabled) {
		// mKeyguardBlur.show();
		} else {
		mLp.flags \|= WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
		}
		}
		/*else {
		mLp.flags &= ~WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
		mLp.privateFlags &= ~WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;
		if (mKeyguardBlurEnabled) {
		mKeyguardBlur.hide();
		}
		mLpChanged.flags \|= WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
		mLpChanged.privateFlags \|= WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;
		} */
		else {
		} else {
		mLpChanged.flags &= ~WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
		mLpChanged.privateFlags &= ~WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;
		}