summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2015-01-23 11:57:52 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-12-08 17:33:52 -0800
commitbd8585321f34585139f6b3191ff0025fb2b552e2 (patch)
tree16d523fd5ccf9e052a6093c2213333c0fe1653b7
parentfa8fc29194db4642342c39d8f928afc27cdf4d7d (diff)
downloadframeworks_base-bd8585321f34585139f6b3191ff0025fb2b552e2.zip
frameworks_base-bd8585321f34585139f6b3191ff0025fb2b552e2.tar.gz
frameworks_base-bd8585321f34585139f6b3191ff0025fb2b552e2.tar.bz2
SystemUI : Add adb over network tile
Change-Id: Ib1fa0c87562ff3a077bf9c7283ce81fc4a8271db
-rw-r--r--packages/SystemUI/res/drawable/ic_qs_network_adb_off.xml32
-rw-r--r--packages/SystemUI/res/drawable/ic_qs_network_adb_on.xml35
-rw-r--r--packages/SystemUI/res/values/cm_strings.xml3
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/AdbOverNetworkTile.java126
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java1
6 files changed, 199 insertions, 0 deletions
diff --git a/packages/SystemUI/res/drawable/ic_qs_network_adb_off.xml b/packages/SystemUI/res/drawable/ic_qs_network_adb_off.xml
new file mode 100644
index 0000000..7c1e235
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_network_adb_off.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2015 The CyanogenMod 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="64dp"
+ android:height="64dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+
+ <path
+ android:fillColor="#4DFFFFFF"
+ android:pathData="M41,37.9L34.1,31l0,0l-6.5-6.5l0,0l-9.8-9.8l0,0L13.1,10L6.5,3.4L4,6l4.1,4.1
+c-4.3,2-6.9,4.1-7.4,4.4l23.3,29l0,0l0,0l7.8-9.7l6.6,6.6L41,37.9Z
+M14,24.5v-2c0-1.9,0.5-3.6,1.5-5.1l7.1,7.1H14z M21.2,13
+l-5.5-5.5c2.5-0.6,5.3-1,8.3-1c13.4,0,22.4,7.3,23.3,8L36.3,28.1l-3.6-3.6H34v-2c0-2.4-0.9-4.6-2.3-6.3l2.3-2.3l-1.4-1.4l-2.3,2.3
+c-1.7-1.4-3.9-2.3-6.3-2.3C23,12.5,22.1,12.7,21.2,13z" />
+</vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_network_adb_on.xml b/packages/SystemUI/res/drawable/ic_qs_network_adb_on.xml
new file mode 100644
index 0000000..669622f
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_qs_network_adb_on.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2015 The CyanogenMod 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="64dp"
+ android:height="64dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M24,43.5l23.3-29c-0.9-0.7-9.9-8-23.3-8c-13.4,0-22.4,7.3-23.3,8L24,43.5L24,43.5
+C24,43.5,24,43.5,24,43.5Z
+M31.7,16.2c1.4,1.7,2.3,3.9,2.3,6.3v2H14v-2c0-2.4,0.9-4.6,2.3-6.3L14,13.9l1.4-1.4l2.3,2.3
+c1.7-1.4,3.9-2.3,6.3-2.3c2.4,0,4.6,0.9,6.3,2.3l2.3-2.3l1.4,1.4L31.7,16.2z
+M22,20.5c0,1.1-0.9,2-2,2c-1.1,0-2-0.9-2-2
+c0-1.1,0.9-2,2-2C21.1,18.5,22,19.4,22,20.5z
+M30,20.5c0,1.1-0.9,2-2,2c-1.1,0-2-0.9-2-2c0-1.1,0.9-2,2-2C29.1,18.5,30,19.4,30,20.5
+z" />
+</vector>
diff --git a/packages/SystemUI/res/values/cm_strings.xml b/packages/SystemUI/res/values/cm_strings.xml
index 0750700..69c8ee0 100644
--- a/packages/SystemUI/res/values/cm_strings.xml
+++ b/packages/SystemUI/res/values/cm_strings.xml
@@ -88,4 +88,7 @@
<string name="quick_settings_custom_tile_detail_title">Custom Tile</string>
<string name="quick_settings_remove">Remove tile</string>
+ <string name="quick_settings_network_adb_enabled_label">Enabled</string>
+ <string name="quick_settings_network_adb_disabled_label">Disabled</string>
+ <string name="qs_tile_adb_over_network">ADB over network</string>
</resources>
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/AdbOverNetworkTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/AdbOverNetworkTile.java
new file mode 100644
index 0000000..7da198d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/AdbOverNetworkTile.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2015 The CyanogenMod 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.qs.tiles;
+
+import android.content.Context;
+import android.content.Intent;
+import android.database.ContentObserver;
+import android.net.NetworkUtils;
+import android.net.Uri;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import com.android.internal.logging.MetricsConstants;
+import com.android.systemui.R;
+import com.android.systemui.qs.QSTile;
+
+import java.net.InetAddress;
+
+import cyanogenmod.providers.CMSettings;
+
+public class AdbOverNetworkTile extends QSTile<QSTile.BooleanState> {
+
+ private static final Intent SETTINGS_DEVELOPMENT =
+ new Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS);
+
+ @Override
+ protected BooleanState newTileState() {
+ return new BooleanState();
+ }
+
+ @Override
+ protected void handleClick() {
+ CMSettings.Secure.putIntForUser(mContext.getContentResolver(),
+ CMSettings.Secure.ADB_PORT, getState().value ? -1 : 5555,
+ UserHandle.USER_CURRENT);
+ }
+
+ @Override
+ protected void handleLongClick() {
+ mHost.startActivityDismissingKeyguard(SETTINGS_DEVELOPMENT);
+ }
+
+ @Override
+ protected void handleUpdateState(BooleanState state, Object arg) {
+ state.visible = isAdbEnabled();
+ if (!state.visible) {
+ return;
+ }
+ state.value = isAdbNetworkEnabled();
+ if (state.value) {
+ WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
+ WifiInfo wifiInfo = wifiManager.getConnectionInfo();
+
+ if (wifiInfo != null) {
+ // if wifiInfo is not null, set the label to "hostAddress"
+ InetAddress address = NetworkUtils.intToInetAddress(wifiInfo.getIpAddress());
+ state.label = address.getHostAddress();
+ } else {
+ //if wifiInfo is null, set the enabled label without host address
+ state.label = mContext.getString(R.string.quick_settings_network_adb_enabled_label);
+ }
+ state.icon = ResourceIcon.get(R.drawable.ic_qs_network_adb_on);
+ } else {
+ // Otherwise set the disabled label and icon
+ state.label = mContext.getString(R.string.quick_settings_network_adb_disabled_label);
+ state.icon = ResourceIcon.get(R.drawable.ic_qs_network_adb_off);
+ }
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsConstants.DONT_TRACK_ME_BRO;
+ }
+
+ private boolean isAdbEnabled() {
+ return Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Global.ADB_ENABLED, 0) > 0;
+ }
+
+ private boolean isAdbNetworkEnabled() {
+ return CMSettings.Secure.getInt(mContext.getContentResolver(),
+ CMSettings.Secure.ADB_PORT, 0) > 0;
+ }
+
+ public AdbOverNetworkTile(Host host) {
+ super(host);
+ }
+
+ private ContentObserver mObserver = new ContentObserver(mHandler) {
+ @Override
+ public void onChange(boolean selfChange, Uri uri) {
+ refreshState();
+ }
+ };
+
+ @Override
+ public void setListening(boolean listening) {
+ if (listening) {
+ mContext.getContentResolver().registerContentObserver(
+ CMSettings.Secure.getUriFor(CMSettings.Secure.ADB_PORT),
+ false, mObserver);
+ mContext.getContentResolver().registerContentObserver(
+ Settings.Secure.getUriFor(Settings.Global.ADB_ENABLED),
+ false, mObserver);
+ } else {
+ mContext.getContentResolver().unregisterContentObserver(mObserver);
+ }
+ }
+
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
index dbee4ba..6aead70 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
@@ -36,6 +36,7 @@ import com.android.internal.logging.MetricsLogger;
import android.widget.RemoteViews;
import com.android.systemui.R;
import com.android.systemui.qs.QSTile;
+import com.android.systemui.qs.tiles.AdbOverNetworkTile;
import com.android.systemui.qs.tiles.AirplaneModeTile;
import com.android.systemui.qs.tiles.BluetoothTile;
import com.android.systemui.qs.tiles.CastTile;
@@ -398,6 +399,7 @@ public class QSTileHost implements QSTile.Host, Tunable {
else if (spec.equals("cast")) return R.string.quick_settings_cast_title;
else if (spec.equals("hotspot")) return R.string.quick_settings_hotspot_label;
else if (spec.equals("edit")) return R.string.quick_settings_edit_label;
+ else if (spec.equals("adb_network")) return R.string.qs_tile_adb_over_network;
return 0;
}
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java b/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java
index 95ca509..b186323 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java
@@ -303,6 +303,7 @@ public class QsTuner extends Fragment implements Callback {
else if (mSpec.equals("location")) return R.drawable.ic_signal_location_enable;
else if (mSpec.equals("cast")) return R.drawable.ic_qs_cast_on;
else if (mSpec.equals("hotspot")) return R.drawable.ic_hotspot_enable;
+ else if (mSpec.equals("adb_network")) return R.drawable.ic_qs_network_adb_on;
return R.drawable.android;
}