Merge "EmergencyCryptkeeperText: Make sure we update if airplane mode changes" into nyc-mr2-dev (1e1d5b07) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/EmergencyCryptkeeperText.java

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package com.android.systemui.statusbar.policy;		package com.android.systemui.statusbar.policy;

	import android.annotation.Nullable;		import android.annotation.Nullable;
			import android.content.BroadcastReceiver;
	import android.content.Context;		import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	import android.content.IntentFilter;		import android.content.IntentFilter;
	@@ -41,12 +42,20 @@ import java.util.List;
	public class EmergencyCryptkeeperText extends TextView {		public class EmergencyCryptkeeperText extends TextView {

	private KeyguardUpdateMonitor mKeyguardUpdateMonitor;		private KeyguardUpdateMonitor mKeyguardUpdateMonitor;
	private KeyguardUpdateMonitorCallback mCallback = new KeyguardUpdateMonitorCallback() {		private final KeyguardUpdateMonitorCallback mCallback = new KeyguardUpdateMonitorCallback() {
	@Override		@Override
	public void onPhoneStateChanged(int phoneState) {		public void onPhoneStateChanged(int phoneState) {
	update();		update();
	}		}
	};		};
			private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
			@Override
			public void onReceive(Context context, Intent intent) {
			if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(intent.getAction())) {
			update();
			}
			}
			};

	public EmergencyCryptkeeperText(Context context, @Nullable AttributeSet attrs) {		public EmergencyCryptkeeperText(Context context, @Nullable AttributeSet attrs) {
	super(context, attrs);		super(context, attrs);
	@@ -58,6 +67,8 @@ public class EmergencyCryptkeeperText extends TextView {
	super.onAttachedToWindow();		super.onAttachedToWindow();
	mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(mContext);		mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
	mKeyguardUpdateMonitor.registerCallback(mCallback);		mKeyguardUpdateMonitor.registerCallback(mCallback);
			getContext().registerReceiver(mReceiver,
			new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED));
	update();		update();
	}		}

	@@ -67,6 +78,7 @@ public class EmergencyCryptkeeperText extends TextView {
	if (mKeyguardUpdateMonitor != null) {		if (mKeyguardUpdateMonitor != null) {
	mKeyguardUpdateMonitor.removeCallback(mCallback);		mKeyguardUpdateMonitor.removeCallback(mCallback);
	}		}
			getContext().unregisterReceiver(mReceiver);
	}		}

	public void update() {		public void update() {