Merge "Update theme after registering config listener" into qt-dev (e44e4c63) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -87,15 +87,14 @@ public class KeyguardMessageArea extends TextView implements SecurityMessageDisp
		monitor.registerCallback(mInfoCallback);
		mHandler = new Handler(Looper.myLooper());
		mConfigurationController = configurationController;

		onThemeChanged();
		update();
		}

		@Override
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();
		mConfigurationController.addCallback(this);
		onThemeChanged();
		}

		@Override
		@@ -116,8 +115,8 @@ public class KeyguardMessageArea extends TextView implements SecurityMessageDisp
		});
		ColorStateList newTextColors = ColorStateList.valueOf(array.getColor(0, Color.RED));
		array.recycle();
		setTextColor(newTextColors);
		mDefaultColorState = newTextColors;
		update();
		}

		@Override

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,6 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
		mAccessibilityController = accessibilityController;
		mConfigurationController = configurationController;
		mStatusBarStateController = statusBarStateController;
		onThemeChanged();
		}

		@Override
		@@ -133,6 +132,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
		mConfigurationController.addCallback(this);
		mKeyguardUpdateMonitor.registerCallback(mUpdateMonitorCallback);
		mUnlockMethodCache.addListener(this);
		onThemeChanged();
		}

		@Override