Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev am: 1afa1646a2 (bd2e0ace) · Commits · e / os / android_frameworks_base

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

+26 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.os.Bundle;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.ViewStub;
		import android.widget.LinearLayout;

		import com.android.systemui.Dependency;
		@@ -36,6 +37,7 @@ import com.android.systemui.statusbar.policy.DarkIconDispatcher;
		import com.android.systemui.statusbar.policy.EncryptionHelper;
		import com.android.systemui.statusbar.policy.KeyguardMonitor;
		import com.android.systemui.statusbar.policy.NetworkController;
		import com.android.systemui.statusbar.policy.NetworkController.SignalCallback;

		/**
		* Contains the collapsed status bar and handles hiding/showing based on disable flags
		@@ -56,6 +58,13 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		private DarkIconManager mDarkIconManager;
		private SignalClusterView mSignalClusterView;

		private SignalCallback mSignalCallback = new SignalCallback() {
		@Override
		public void setIsAirplaneMode(NetworkController.IconState icon) {
		mStatusBarComponent.recomputeDisableFlags(true /* animate */);
		}
		};

		@Override
		public void onCreate(@Nullable Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		@@ -84,6 +93,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		Dependency.get(DarkIconDispatcher.class).addDarkReceiver(mSignalClusterView);
		// Default to showing until we know otherwise.
		showSystemIconArea(false);
		initEmergencyCryptkeeperText();
		}

		@Override
		@@ -109,6 +119,9 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		super.onDestroyView();
		Dependency.get(DarkIconDispatcher.class).removeDarkReceiver(mSignalClusterView);
		Dependency.get(StatusBarIconController.class).removeIconGroup(mDarkIconManager);
		if (mNetworkController.hasEmergencyCryptKeeperText()) {
		mNetworkController.removeCallback(mSignalCallback);
		}
		}

		public void initNotificationIconArea(NotificationIconAreaController
		@@ -233,4 +246,17 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		.start();
		}
		}

		private void initEmergencyCryptkeeperText() {
		View emergencyViewStub = mStatusBar.findViewById(R.id.emergency_cryptkeeper_text);
		if (mNetworkController.hasEmergencyCryptKeeperText()) {
		if (emergencyViewStub != null) {
		((ViewStub) emergencyViewStub).inflate();
		}
		mNetworkController.addCallback(mSignalCallback);
		} else if (emergencyViewStub != null) {
		ViewGroup parent = (ViewGroup) emergencyViewStub.getParent();
		parent.removeView(emergencyViewStub);
		}
		}
		}

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

+0 −20

Original line number	Diff line number	Diff line
		@@ -1122,8 +1122,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		// Other icons
		mVolumeComponent = getComponent(VolumeComponent.class);

		initEmergencyCryptkeeperText();

		mKeyguardBottomArea.setStatusBar(this);
		mKeyguardBottomArea.setUserSetupComplete(mUserSetup);
		if (UserManager.get(mContext).isUserSwitcherEnabled()) {
		@@ -1233,24 +1231,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		});
		}

		private void initEmergencyCryptkeeperText() {
		View emergencyViewStub = mStatusBarWindow.findViewById(R.id.emergency_cryptkeeper_text);
		if (mNetworkController.hasEmergencyCryptKeeperText()) {
		if (emergencyViewStub != null) {
		((ViewStub) emergencyViewStub).inflate();
		}
		mNetworkController.addCallback(new NetworkController.SignalCallback() {
		@Override
		public void setIsAirplaneMode(NetworkController.IconState icon) {
		recomputeDisableFlags(true /* animate */);
		}
		});
		} else if (emergencyViewStub != null) {
		ViewGroup parent = (ViewGroup) emergencyViewStub.getParent();
		parent.removeView(emergencyViewStub);
		}
		}

		/**
		* Returns the {@link android.view.View.OnTouchListener} that will be invoked when the
		* background window of the status bar is clicked.