Merge "Move some stuff to SettingsLib to use for Settings Home" (98c204ad) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataControllerImpl.java→packages/SettingsLib/src/com/android/settingslib/net/MobileDataController.java

+26 −14

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 The Android Open Source Project
		* 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.
		@@ -14,14 +14,7 @@
		* limitations under the License.
		*/

		package com.android.systemui.statusbar.policy;

		import static android.net.ConnectivityManager.TYPE_MOBILE;
		import static android.net.NetworkStatsHistory.FIELD_RX_BYTES;
		import static android.net.NetworkStatsHistory.FIELD_TX_BYTES;
		import static android.telephony.TelephonyManager.SIM_STATE_READY;
		import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
		import static android.text.format.DateUtils.FORMAT_SHOW_DATE;
		package com.android.settingslib.net;

		import android.content.Context;
		import android.net.ConnectivityManager;
		@@ -42,7 +35,14 @@ import android.util.Log;
		import java.util.Date;
		import java.util.Locale;

		public class MobileDataControllerImpl implements NetworkController.MobileDataController {
		import static android.net.ConnectivityManager.TYPE_MOBILE;
		import static android.net.NetworkStatsHistory.FIELD_RX_BYTES;
		import static android.net.NetworkStatsHistory.FIELD_TX_BYTES;
		import static android.telephony.TelephonyManager.SIM_STATE_READY;
		import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
		import static android.text.format.DateUtils.FORMAT_SHOW_DATE;

		public class MobileDataController {
		private static final String TAG = "MobileDataController";
		private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

		@@ -60,9 +60,9 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon

		private INetworkStatsSession mSession;
		private Callback mCallback;
		private NetworkControllerImpl mNetworkController;
		private NetworkNameProvider mNetworkController;

		public MobileDataControllerImpl(Context context) {
		public MobileDataController(Context context) {
		mContext = context;
		mTelephonyManager = TelephonyManager.from(context);
		mConnectivityManager = ConnectivityManager.from(context);
		@@ -71,7 +71,7 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon
		mPolicyManager = NetworkPolicyManager.from(mContext);
		}

		public void setNetworkController(NetworkControllerImpl networkController) {
		public void setNetworkController(NetworkNameProvider networkController) {
		mNetworkController = networkController;
		}

		@@ -161,7 +161,7 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon
		} else {
		usage.warningLevel = DEFAULT_WARNING_LEVEL;
		}
		if (usage != null) {
		if (usage != null && mNetworkController != null) {
		usage.carrier = mNetworkController.getMobileDataNetworkName();
		}
		return usage;
		@@ -231,6 +231,18 @@ public class MobileDataControllerImpl implements NetworkController.MobileDataCon
		}
		}

		public interface NetworkNameProvider {
		String getMobileDataNetworkName();
		}

		public static class DataUsageInfo {
		public String carrier;
		public String period;
		public long limitLevel;
		public long warningLevel;
		public long usageLevel;
		}

		public interface Callback {
		void onMobileDataEnabled(boolean enabled);
		}

packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java

0 → 100644

+79 −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.settingslib.wifi;

		import android.content.Intent;
		import android.net.NetworkInfo;
		import android.net.wifi.WifiConfiguration;
		import android.net.wifi.WifiInfo;
		import android.net.wifi.WifiManager;

		import java.util.List;

		public class WifiStatusTracker {

		private final WifiManager mWifiManager;
		public boolean enabled;
		public boolean connected;
		public String ssid;
		public int rssi;
		public int level;

		public WifiStatusTracker(WifiManager wifiManager) {
		mWifiManager = wifiManager;
		}

		public void handleBroadcast(Intent intent) {
		String action = intent.getAction();
		if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
		enabled = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
		WifiManager.WIFI_STATE_UNKNOWN) == WifiManager.WIFI_STATE_ENABLED;
		} else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
		final NetworkInfo networkInfo = (NetworkInfo)
		intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
		connected = networkInfo != null && networkInfo.isConnected();
		// If Connected grab the signal strength and ssid.
		if (connected) {
		// try getting it out of the intent first
		WifiInfo info = intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO) != null
		? (WifiInfo) intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO)
		: mWifiManager.getConnectionInfo();
		if (info != null) {
		ssid = getSsid(info);
		} else {
		ssid = null;
		}
		} else if (!connected) {
		ssid = null;
		}
		} else if (action.equals(WifiManager.RSSI_CHANGED_ACTION)) {
		// Default to -200 as its below WifiManager.MIN_RSSI.
		rssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200);
		level = WifiManager.calculateSignalLevel(rssi, 5);
		}
		}

		private String getSsid(WifiInfo info) {
		String ssid = info.getSSID();
		if (ssid != null) {
		return ssid;
		}
		// OK, it's not in the connectionInfo; we have to go hunting for it
		List<WifiConfiguration> networks = mWifiManager.getConfiguredNetworks();
		int length = networks.size();
		for (int i = 0; i < length; i++) {
		if (networks.get(i).networkId == info.getNetworkId()) {
		return networks.get(i).SSID;
		}
		}
		return null;
		}
		}

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -23,16 +23,14 @@ import android.content.res.Resources;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;

		import com.android.internal.logging.MetricsLogger;
		import com.android.settingslib.net.MobileDataController;
		import com.android.systemui.R;
		import com.android.systemui.qs.QSTile;
		import com.android.systemui.qs.QSTileBaseView;
		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.SignalCallbackAdapter;

		/ Quick settings tile: Cellular /
		@@ -247,7 +245,7 @@ public class CellularTile extends QSTile<QSTile.SignalState> {
		final DataUsageDetailView v = (DataUsageDetailView) (convertView != null
		? convertView
		: LayoutInflater.from(mContext).inflate(R.layout.data_usage, parent, false));
		final DataUsageInfo info = mDataController.getDataUsageInfo();
		final MobileDataController.DataUsageInfo info = mDataController.getDataUsageInfo();
		if (info == null) return v;
		v.bind(info);
		return v;

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -23,11 +23,10 @@ import android.util.AttributeSet;
		import android.view.View;
		import android.widget.LinearLayout;
		import android.widget.TextView;

		import com.android.settingslib.net.MobileDataController;
		import com.android.systemui.FontSizeUtils;
		import com.android.systemui.R;
		import com.android.systemui.qs.DataUsageGraph;
		import com.android.systemui.statusbar.policy.NetworkController;

		import java.text.DecimalFormat;

		@@ -60,7 +59,7 @@ public class DataUsageDetailView extends LinearLayout {
		R.dimen.qs_data_usage_text_size);
		}

		public void bind(NetworkController.MobileDataController.DataUsageInfo info) {
		public void bind(MobileDataController.DataUsageInfo info) {
		final Resources res = mContext.getResources();
		final int titleId;
		final long bytes;

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

+1 −19

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ package com.android.systemui.statusbar.policy;
		import android.content.Context;
		import android.content.Intent;
		import android.telephony.SubscriptionInfo;

		import com.android.settingslib.net.MobileDataController;
		import com.android.settingslib.wifi.AccessPoint;

		import java.util.List;
		@@ -85,22 +85,4 @@ public interface NetworkController {
		void onSettingsActivityTriggered(Intent settingsIntent);
		}
		}

		/**
		* Tracks mobile data support and usage.
		*/
		public interface MobileDataController {
		boolean isMobileDataSupported();
		boolean isMobileDataEnabled();
		void setMobileDataEnabled(boolean enabled);
		DataUsageInfo getDataUsageInfo();

		public static class DataUsageInfo {
		public String carrier;
		public String period;
		public long limitLevel;
		public long warningLevel;
		public long usageLevel;
		}
		}
		}