Merge "Move NetworkController broadcasts/listeners to BG" into mnc-dev (99f6977d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java

+28 −27

Original line number	Diff line number	Diff line
		@@ -30,9 +30,11 @@ import com.android.systemui.qs.QSTile;
		import com.android.systemui.qs.QSTileView;
		import com.android.systemui.qs.SignalTileView;
		import com.android.systemui.statusbar.policy.NetworkController;
		import com.android.systemui.statusbar.policy.NetworkController.IconState;
		import com.android.systemui.statusbar.policy.NetworkController.MobileDataController;
		import com.android.systemui.statusbar.policy.NetworkController.MobileDataController.DataUsageInfo;
		import com.android.systemui.statusbar.policy.NetworkController.NetworkSignalChangedCallback;
		import com.android.systemui.statusbar.policy.NetworkController.SignalCallback;
		import com.android.systemui.statusbar.policy.SignalCallbackAdapter;

		/ Quick settings tile: Cellular /
		public class CellularTile extends QSTile<QSTile.SignalState> {
		@@ -63,9 +65,9 @@ public class CellularTile extends QSTile<QSTile.SignalState> {
		@Override
		public void setListening(boolean listening) {
		if (listening) {
		mController.addNetworkSignalChangedCallback(mCallback);
		mController.addSignalCallback(mSignalCallback);
		} else {
		mController.removeNetworkSignalChangedCallback(mCallback);
		mController.removeSignalCallback(mSignalCallback);
		}
		}

		@@ -138,7 +140,6 @@ public class CellularTile extends QSTile<QSTile.SignalState> {
		private static final class CallbackInfo {
		boolean enabled;
		boolean wifiEnabled;
		boolean wifiConnected;
		boolean airplaneModeEnabled;
		int mobileSignalIconId;
		String signalContentDescription;
		@@ -151,40 +152,39 @@ public class CellularTile extends QSTile<QSTile.SignalState> {
		boolean isDataTypeIconWide;
		}

		private final NetworkSignalChangedCallback mCallback = new NetworkSignalChangedCallback() {
		private final SignalCallback mSignalCallback = new SignalCallbackAdapter() {
		private final CallbackInfo mInfo = new CallbackInfo();

		@Override
		public void onWifiSignalChanged(boolean enabled, boolean connected, int wifiSignalIconId,
		boolean activityIn, boolean activityOut,
		String wifiSignalContentDescriptionId, String description) {
		public void setWifiIndicators(boolean enabled, IconState statusIcon, IconState qsIcon,
		boolean activityIn, boolean activityOut, String description) {
		mInfo.wifiEnabled = enabled;
		mInfo.wifiConnected = connected;
		refreshState(mInfo);
		}

		@Override
		public void onMobileDataSignalChanged(boolean enabled,
		int mobileSignalIconId,
		String mobileSignalContentDescriptionId, int dataTypeIconId,
		boolean activityIn, boolean activityOut,
		String dataTypeContentDescriptionId, String description,
		boolean isDataTypeIconWide) {
		mInfo.enabled = enabled;
		mInfo.mobileSignalIconId = mobileSignalIconId;
		mInfo.signalContentDescription = mobileSignalContentDescriptionId;
		mInfo.dataTypeIconId = dataTypeIconId;
		mInfo.dataContentDescription = dataTypeContentDescriptionId;
		public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon,
		int darkStatusIcon, int statusType, int qsType, boolean activityIn,
		boolean activityOut, String typeContentDescription, String description,
		boolean isWide, int subId) {
		if (qsIcon == null) {
		// Not data sim, don't display.
		return;
		}
		mInfo.enabled = qsIcon.visible;
		mInfo.mobileSignalIconId = qsIcon.icon;
		mInfo.signalContentDescription = qsIcon.contentDescription;
		mInfo.dataTypeIconId = qsType;
		mInfo.dataContentDescription = typeContentDescription;
		mInfo.activityIn = activityIn;
		mInfo.activityOut = activityOut;
		mInfo.enabledDesc = description;
		mInfo.isDataTypeIconWide = isDataTypeIconWide;
		mInfo.isDataTypeIconWide = qsType != 0 && isWide;
		refreshState(mInfo);
		}

		@Override
		public void onNoSimVisibleChanged(boolean visible) {
		mInfo.noSim = visible;
		public void setNoSims(boolean show) {
		mInfo.noSim = show;
		if (mInfo.noSim) {
		// Make sure signal gets cleared out when no sims.
		mInfo.mobileSignalIconId = 0;
		@@ -199,12 +199,13 @@ public class CellularTile extends QSTile<QSTile.SignalState> {
		}

		@Override
		public void onAirplaneModeChanged(boolean enabled) {
		mInfo.airplaneModeEnabled = enabled;
		public void setIsAirplaneMode(IconState icon) {
		mInfo.airplaneModeEnabled = icon.visible;
		refreshState(mInfo);
		}

		public void onMobileDataEnabled(boolean enabled) {
		@Override
		public void setMobileDataEnabled(boolean enabled) {
		mDetailAdapter.setMobileDataEnabled(enabled);
		}
		};

packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java

+13 −36

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package com.android.systemui.qs.tiles;

		import java.util.List;

		import android.content.Context;
		import android.content.Intent;
		import android.content.res.Resources;
		@@ -36,7 +34,11 @@ import com.android.systemui.qs.QSTileView;
		import com.android.systemui.qs.SignalTileView;
		import com.android.systemui.statusbar.policy.NetworkController;
		import com.android.systemui.statusbar.policy.NetworkController.AccessPointController;
		import com.android.systemui.statusbar.policy.NetworkController.NetworkSignalChangedCallback;
		import com.android.systemui.statusbar.policy.NetworkController.IconState;
		import com.android.systemui.statusbar.policy.NetworkController.SignalCallback;
		import com.android.systemui.statusbar.policy.SignalCallbackAdapter;

		import java.util.List;

		/ Quick settings tile: Wifi /
		public class WifiTile extends QSTile<QSTile.SignalState> {
		@@ -67,9 +69,9 @@ public class WifiTile extends QSTile<QSTile.SignalState> {
		@Override
		public void setListening(boolean listening) {
		if (listening) {
		mController.addNetworkSignalChangedCallback(mCallback);
		mController.addSignalCallback(mSignalCallback);
		} else {
		mController.removeNetworkSignalChangedCallback(mCallback);
		mController.removeSignalCallback(mSignalCallback);
		}
		}

		@@ -211,46 +213,21 @@ public class WifiTile extends QSTile<QSTile.SignalState> {
		}
		}

		private final NetworkSignalChangedCallback mCallback = new NetworkSignalChangedCallback() {
		private final SignalCallback mSignalCallback = new SignalCallbackAdapter() {
		@Override
		public void onWifiSignalChanged(boolean enabled, boolean connected, int wifiSignalIconId,
		boolean activityIn, boolean activityOut,
		String wifiSignalContentDescriptionId, String description) {
		public void setWifiIndicators(boolean enabled, IconState statusIcon, IconState qsIcon,
		boolean activityIn, boolean activityOut, String description) {
		if (DEBUG) Log.d(TAG, "onWifiSignalChanged enabled=" + enabled);
		final CallbackInfo info = new CallbackInfo();
		info.enabled = enabled;
		info.connected = connected;
		info.wifiSignalIconId = wifiSignalIconId;
		info.connected = qsIcon.visible;
		info.wifiSignalIconId = qsIcon.icon;
		info.enabledDesc = description;
		info.activityIn = activityIn;
		info.activityOut = activityOut;
		info.wifiSignalContentDescription = wifiSignalContentDescriptionId;
		info.wifiSignalContentDescription = qsIcon.contentDescription;
		refreshState(info);
		}

		@Override
		public void onMobileDataSignalChanged(boolean enabled,
		int mobileSignalIconId,
		String mobileSignalContentDescriptionId, int dataTypeIconId,
		boolean activityIn, boolean activityOut,
		String dataTypeContentDescriptionId, String description,
		boolean isDataTypeIconWide) {
		// noop
		}

		public void onNoSimVisibleChanged(boolean noSims) {
		// noop
		}

		@Override
		public void onAirplaneModeChanged(boolean enabled) {
		// noop
		}

		@Override
		public void onMobileDataEnabled(boolean enabled) {
		// noop
		}
		};

		private final class WifiDetailAdapter implements DetailAdapter,

packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java

+31 −25

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.widget.ImageView;
		import android.widget.LinearLayout;

		import com.android.systemui.R;
		import com.android.systemui.statusbar.policy.NetworkController.IconState;
		import com.android.systemui.statusbar.policy.NetworkControllerImpl;
		import com.android.systemui.statusbar.policy.SecurityController;

		@@ -42,7 +43,7 @@ import java.util.List;
		// Intimately tied to the design of res/layout/signal_cluster_view.xml
		public class SignalClusterView
		extends LinearLayout
		implements NetworkControllerImpl.SignalCluster,
		implements NetworkControllerImpl.SignalCallback,
		SecurityController.SecurityControllerCallback {

		static final String TAG = "SignalClusterView";
		@@ -59,7 +60,7 @@ public class SignalClusterView
		private int mWifiStrengthId = 0;
		private boolean mIsAirplaneMode = false;
		private int mAirplaneIconId = 0;
		private int mAirplaneContentDescription;
		private String mAirplaneContentDescription;
		private String mWifiDescription;
		private String mEthernetDescription;
		private ArrayList<PhoneState> mPhoneStates = new ArrayList<PhoneState>();
		@@ -166,35 +167,36 @@ public class SignalClusterView
		}

		@Override
		public void setWifiIndicators(boolean visible, int strengthIcon, String contentDescription) {
		mWifiVisible = visible;
		mWifiStrengthId = strengthIcon;
		mWifiDescription = contentDescription;
		public void setWifiIndicators(boolean enabled, IconState statusIcon, IconState qsIcon,
		boolean activityIn, boolean activityOut, String description) {
		mWifiVisible = statusIcon.visible;
		mWifiStrengthId = statusIcon.icon;
		mWifiDescription = statusIcon.contentDescription;

		apply();
		}

		@Override
		public void setMobileDataIndicators(boolean visible, int strengthIcon, int darkStrengthIcon,
		int typeIcon, String contentDescription, String typeContentDescription,
		boolean isTypeIconWide, int subId) {
		public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int darkStatusIcon,
		int statusType, int qsType, boolean activityIn, boolean activityOut,
		String typeContentDescription, String description, boolean isWide, int subId) {
		PhoneState state = getOrInflateState(subId);
		state.mMobileVisible = visible;
		state.mMobileStrengthId = strengthIcon;
		state.mMobileDarkStrengthId = darkStrengthIcon;
		state.mMobileTypeId = typeIcon;
		state.mMobileDescription = contentDescription;
		state.mMobileVisible = statusIcon.visible;
		state.mMobileStrengthId = statusIcon.icon;
		state.mMobileDarkStrengthId = darkStatusIcon;
		state.mMobileTypeId = statusType;
		state.mMobileDescription = statusIcon.contentDescription;
		state.mMobileTypeDescription = typeContentDescription;
		state.mIsMobileTypeIconWide = isTypeIconWide;
		state.mIsMobileTypeIconWide = statusType != 0 && isWide;

		apply();
		}

		@Override
		public void setEthernetIndicators(boolean visible, int icon, String contentDescription) {
		mEthernetVisible = visible;
		mEthernetIconId = icon;
		mEthernetDescription = contentDescription;
		public void setEthernetIndicators(IconState state) {
		mEthernetVisible = state.visible;
		mEthernetIconId = state.icon;
		mEthernetDescription = state.contentDescription;

		apply();
		}
		@@ -239,14 +241,19 @@ public class SignalClusterView
		}

		@Override
		public void setIsAirplaneMode(boolean is, int airplaneIconId, int contentDescription) {
		mIsAirplaneMode = is;
		mAirplaneIconId = airplaneIconId;
		mAirplaneContentDescription = contentDescription;
		public void setIsAirplaneMode(IconState icon) {
		mIsAirplaneMode = icon.visible;
		mAirplaneIconId = icon.icon;
		mAirplaneContentDescription = icon.contentDescription;

		apply();
		}

		@Override
		public void setMobileDataEnabled(boolean enabled) {
		// Don't care.
		}

		@Override
		public boolean dispatchPopulateAccessibilityEventInternal(AccessibilityEvent event) {
		// Standard group layout onPopulateAccessibilityEvent() implementations
		@@ -343,8 +350,7 @@ public class SignalClusterView

		if (mIsAirplaneMode) {
		mAirplane.setImageResource(mAirplaneIconId);
		mAirplane.setContentDescription(mAirplaneContentDescription != 0 ?
		mContext.getString(mAirplaneContentDescription) : null);
		mAirplane.setContentDescription(mAirplaneContentDescription);
		mAirplane.setVisibility(View.VISIBLE);
		} else {
		mAirplane.setVisibility(View.GONE);

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

+13 −3

Original line number	Diff line number	Diff line
		@@ -779,9 +779,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		(SignalClusterView) mKeyguardStatusBar.findViewById(R.id.signal_cluster);
		final SignalClusterView signalClusterQs =
		(SignalClusterView) mHeader.findViewById(R.id.signal_cluster);
		mNetworkController.addSignalCluster(signalCluster);
		mNetworkController.addSignalCluster(signalClusterKeyguard);
		mNetworkController.addSignalCluster(signalClusterQs);
		mNetworkController.addSignalCallback(signalCluster);
		mNetworkController.addSignalCallback(signalClusterKeyguard);
		mNetworkController.addSignalCallback(signalClusterQs);
		signalCluster.setSecurityController(mSecurityController);
		signalCluster.setNetworkController(mNetworkController);
		signalClusterKeyguard.setSecurityController(mSecurityController);
		@@ -3087,6 +3087,16 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}
		mContext.unregisterReceiver(mBroadcastReceiver);
		mAssistManager.destroy();

		final SignalClusterView signalCluster =
		(SignalClusterView) mStatusBarView.findViewById(R.id.signal_cluster);
		final SignalClusterView signalClusterKeyguard =
		(SignalClusterView) mKeyguardStatusBar.findViewById(R.id.signal_cluster);
		final SignalClusterView signalClusterQs =
		(SignalClusterView) mHeader.findViewById(R.id.signal_cluster);
		mNetworkController.addSignalCallback(signalCluster);
		mNetworkController.addSignalCallback(signalClusterKeyguard);
		mNetworkController.addSignalCallback(signalClusterQs);
		}

		private boolean mDemoModeAllowed;

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

0 → 100644

+181 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.systemui.statusbar.policy;

		import android.os.Handler;
		import android.os.Looper;
		import android.os.Message;
		import android.telephony.SubscriptionInfo;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.systemui.statusbar.policy.NetworkController.IconState;
		import com.android.systemui.statusbar.policy.NetworkController.SignalCallback;
		import com.android.systemui.statusbar.policy.NetworkControllerImpl.EmergencyListener;

		import java.util.ArrayList;
		import java.util.List;


		/**
		* Implements network listeners and forwards the calls along onto other listeners but on
		* the current or specified Looper.
		*/
		public class CallbackHandler extends Handler implements EmergencyListener, SignalCallback {
		private static final int MSG_EMERGENCE_CHANGED = 0;
		private static final int MSG_SUBS_CHANGED = 1;
		private static final int MSG_NO_SIM_VISIBLE_CHANGED = 2;
		private static final int MSG_ETHERNET_CHANGED = 3;
		private static final int MSG_AIRPLANE_MODE_CHANGED = 4;
		private static final int MSG_MOBILE_DATA_ENABLED_CHANGED = 5;
		private static final int MSG_ADD_REMOVE_EMERGENCY = 6;
		private static final int MSG_ADD_REMOVE_SIGNAL = 7;

		// All the callbacks.
		private final ArrayList<EmergencyListener> mEmergencyListeners = new ArrayList<>();
		private final ArrayList<SignalCallback> mSignalCallbacks = new ArrayList<>();

		public CallbackHandler() {
		super();
		}

		@VisibleForTesting
		CallbackHandler(Looper looper) {
		super(looper);
		}

		@Override
		@SuppressWarnings("unchecked")
		public void handleMessage(Message msg) {
		switch (msg.what) {
		case MSG_EMERGENCE_CHANGED:
		for (EmergencyListener listener : mEmergencyListeners) {
		listener.setEmergencyCallsOnly(msg.arg1 != 0);
		}
		break;
		case MSG_SUBS_CHANGED:
		for (SignalCallback signalCluster : mSignalCallbacks) {
		signalCluster.setSubs((List<SubscriptionInfo>) msg.obj);
		}
		break;
		case MSG_NO_SIM_VISIBLE_CHANGED:
		for (SignalCallback signalCluster : mSignalCallbacks) {
		signalCluster.setNoSims(msg.arg1 != 0);
		}
		break;
		case MSG_ETHERNET_CHANGED:
		for (SignalCallback signalCluster : mSignalCallbacks) {
		signalCluster.setEthernetIndicators((IconState) msg.obj);
		}
		break;
		case MSG_AIRPLANE_MODE_CHANGED:
		for (SignalCallback signalCluster : mSignalCallbacks) {
		signalCluster.setIsAirplaneMode((IconState) msg.obj);
		}
		break;
		case MSG_MOBILE_DATA_ENABLED_CHANGED:
		for (SignalCallback signalCluster : mSignalCallbacks) {
		signalCluster.setMobileDataEnabled(msg.arg1 != 0);
		}
		break;
		case MSG_ADD_REMOVE_EMERGENCY:
		if (msg.arg1 != 0) {
		mEmergencyListeners.add((EmergencyListener) msg.obj);
		} else {
		mEmergencyListeners.remove((EmergencyListener) msg.obj);
		}
		break;
		case MSG_ADD_REMOVE_SIGNAL:
		if (msg.arg1 != 0) {
		mSignalCallbacks.add((SignalCallback) msg.obj);
		} else {
		mSignalCallbacks.remove((SignalCallback) msg.obj);
		}
		break;
		}
		}

		@Override
		public void setWifiIndicators(final boolean enabled, final IconState statusIcon,
		final IconState qsIcon, final boolean activityIn, final boolean activityOut,
		final String description) {
		post(new Runnable() {
		@Override
		public void run() {
		for (SignalCallback callback : mSignalCallbacks) {
		callback.setWifiIndicators(enabled, statusIcon, qsIcon, activityIn, activityOut,
		description);
		}
		}
		});
		}

		@Override
		public void setMobileDataIndicators(final IconState statusIcon, final IconState qsIcon,
		final int darkStatusIcon, final int statusType, final int qsType,
		final boolean activityIn, final boolean activityOut,
		final String typeContentDescription, final String description, final boolean isWide,
		final int subId) {
		post(new Runnable() {
		@Override
		public void run() {
		for (SignalCallback signalCluster : mSignalCallbacks) {
		signalCluster.setMobileDataIndicators(statusIcon, qsIcon, darkStatusIcon,
		statusType, qsType, activityIn, activityOut, typeContentDescription,
		description, isWide, subId);
		}
		}
		});
		}

		@Override
		public void setSubs(List<SubscriptionInfo> subs) {
		obtainMessage(MSG_SUBS_CHANGED, subs).sendToTarget();
		}

		@Override
		public void setNoSims(boolean show) {
		obtainMessage(MSG_NO_SIM_VISIBLE_CHANGED, show ? 1 : 0, 0).sendToTarget();
		}

		@Override
		public void setMobileDataEnabled(boolean enabled) {
		obtainMessage(MSG_MOBILE_DATA_ENABLED_CHANGED, enabled ? 1 : 0, 0).sendToTarget();
		}

		@Override
		public void setEmergencyCallsOnly(boolean emergencyOnly) {
		obtainMessage(MSG_EMERGENCE_CHANGED, emergencyOnly ? 1 : 0, 0).sendToTarget();
		}

		@Override
		public void setEthernetIndicators(IconState icon) {
		obtainMessage(MSG_ETHERNET_CHANGED, icon).sendToTarget();;
		}

		@Override
		public void setIsAirplaneMode(IconState icon) {
		obtainMessage(MSG_AIRPLANE_MODE_CHANGED, icon).sendToTarget();;
		}

		public void setListening(EmergencyListener listener, boolean listening) {
		obtainMessage(MSG_ADD_REMOVE_EMERGENCY, listening ? 1 : 0, 0, listener).sendToTarget();
		}

		public void setListening(SignalCallback listener, boolean listening) {
		obtainMessage(MSG_ADD_REMOVE_SIGNAL, listening ? 1 : 0, 0, listener).sendToTarget();
		}

		}