Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev (9d0d796f) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/keyguard/CarrierText.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -85,10 +85,21 @@ public class CarrierText extends TextView {
		protected void onFinishInflate() {
		super.onFinishInflate();
		mSeparator = getResources().getString(R.string.kg_text_message_separator);
		KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mCallback);
		setSelected(true); // Allow marquee to work.
		}

		@Override
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();
		KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mCallback);
		}

		@Override
		protected void onDetachedFromWindow() {
		super.onDetachedFromWindow();
		KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mCallback);
		}

		/**
		* Top-level function for creating carrier text. Makes text based on simState, PLMN
		* and SPN as well as device capabilities, such as being emergency call capable.

+12 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,18 @@ public class EmergencyButton extends Button {
		super(context, attrs);
		}

		@Override
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();
		KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mInfoCallback);
		}

		@Override
		protected void onDetachedFromWindow() {
		super.onDetachedFromWindow();
		KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mInfoCallback);
		}

		@Override
		protected void onFinishInflate() {
		super.onFinishInflate();