diff options
34 files changed, 43 insertions, 6 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_flowing.png Binary files differnew file mode 100644 index 000000000000..76332c11bac1 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..3b8aff4a3888 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_flowing.png Binary files differnew file mode 100644 index 000000000000..54e02b5d0be0 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..046c9a01e5c5 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_flowing.png Binary files differnew file mode 100644 index 000000000000..21f90b075c02 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..1456eeaadad6 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_flowing.png Binary files differnew file mode 100644 index 000000000000..a2675e9b26c3 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..96a205f4c140 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_flowing.png Binary files differnew file mode 100644 index 000000000000..c6267a4df5a0 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..5e42b55fcbcb --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_flowing.png Binary files differnew file mode 100644 index 000000000000..bd400b5bc067 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..4dab1712dfe8 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_flowing.png Binary files differnew file mode 100644 index 000000000000..9c868f100c17 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..e3a3cec57714 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_flowing.png Binary files differnew file mode 100644 index 000000000000..b9ba6d5c17fd --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_flowing.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..0ad77f19b7b2 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_flowing.png Binary files differnew file mode 100644 index 000000000000..0de57601a9d4 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..e04269677d41 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_flowing.png Binary files differnew file mode 100644 index 000000000000..88b08c8178b0 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..940adf0750ad --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_flowing.png Binary files differnew file mode 100644 index 000000000000..3f4dedd9bcc2 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..83045cecc4a3 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_flowing.png Binary files differnew file mode 100644 index 000000000000..f5c0aa3f8aec --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..429e81815514 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_flowing.png Binary files differnew file mode 100644 index 000000000000..42a798a292ca --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..1643e6e23ed1 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_flowing.png Binary files differnew file mode 100644 index 000000000000..06ae2ca82fc3 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..8f1831d2ecec --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_flowing.png Binary files differnew file mode 100644 index 000000000000..12138d3d643a --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..11fd5e9303cf --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_flowing.png Binary files differnew file mode 100644 index 000000000000..8bbc5ba43edb --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_flowing.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully_flowing.png Binary files differnew file mode 100644 index 000000000000..c817598b3db6 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully_flowing.png diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index a4c153fc6297..c94f9ee8808c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -76,7 +76,9 @@ public class NetworkController extends BroadcastReceiver { int mPhoneSignalIconId; int mDataDirectionIconId; int mDataSignalIconId; + int mDataActiveSignalIconId; int mDataTypeIconId; + boolean mDataActive; // wifi final WifiManager mWifiManager; @@ -365,15 +367,17 @@ public class NetworkController extends BroadcastReceiver { if (Settings.System.getInt(mContext.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 0) == 1) { mPhoneSignalIconId = R.drawable.stat_sys_signal_flightmode; - mDataSignalIconId = R.drawable.stat_sys_signal_flightmode; + mDataActiveSignalIconId = mDataSignalIconId = R.drawable.stat_sys_signal_flightmode; } else { mPhoneSignalIconId = R.drawable.stat_sys_signal_null; - mDataSignalIconId = R.drawable.stat_sys_signal_0; // note we use 0 instead of null + // note we use 0 instead of null + mDataActiveSignalIconId = mDataSignalIconId = R.drawable.stat_sys_signal_0; } } else { if (mSignalStrength == null) { mPhoneSignalIconId = R.drawable.stat_sys_signal_null; - mDataSignalIconId = R.drawable.stat_sys_signal_0; // note we use 0 instead of null + // note we use 0 instead of null + mDataActiveSignalIconId = mDataSignalIconId = R.drawable.stat_sys_signal_0; } else if (isCdma()) { // If 3G(EV) and 1x network are available than 3G should be // displayed, displayed RSSI should be from the EV side. @@ -392,6 +396,8 @@ public class NetworkController extends BroadcastReceiver { } mPhoneSignalIconId = iconList[iconLevel]; mDataSignalIconId = TelephonyIcons.DATA_SIGNAL_STRENGTH[mInetCondition][iconLevel]; + mDataActiveSignalIconId + = TelephonyIcons.DATA_SIGNAL_STRENGTH_ACTIVE[mInetCondition][iconLevel]; } else { int asu = mSignalStrength.getGsmSignalStrength(); @@ -415,6 +421,8 @@ public class NetworkController extends BroadcastReceiver { } mPhoneSignalIconId = iconList[iconLevel]; mDataSignalIconId = TelephonyIcons.DATA_SIGNAL_STRENGTH[mInetCondition][iconLevel]; + mDataActiveSignalIconId + = TelephonyIcons.DATA_SIGNAL_STRENGTH_ACTIVE[mInetCondition][iconLevel]; } } } @@ -691,7 +699,16 @@ public class NetworkController extends BroadcastReceiver { dataTypeIconId = 0; } else if (mDataConnected) { label = mNetworkName; - combinedSignalIconId = mDataSignalIconId; + switch (mDataActivity) { + case TelephonyManager.DATA_ACTIVITY_IN: + case TelephonyManager.DATA_ACTIVITY_OUT: + case TelephonyManager.DATA_ACTIVITY_INOUT: + combinedSignalIconId = mDataActiveSignalIconId; + break; + default: + combinedSignalIconId = mDataSignalIconId; + break; + } dataTypeIconId = mDataTypeIconId; } else if (mBluetoothTethered) { label = mContext.getString(R.string.bluetooth_tethered); @@ -705,13 +722,16 @@ public class NetworkController extends BroadcastReceiver { if (false) { Slog.d(TAG, "refreshViews combinedSignalIconId=0x" - + Integer.toHexString(mPhoneSignalIconId) + + Integer.toHexString(combinedSignalIconId) + + "/" + getResourceName(combinedSignalIconId) + + " mDataActivity=" + mDataActivity + " mPhoneSignalIconId=0x" + Integer.toHexString(mPhoneSignalIconId) + " mDataDirectionIconId=0x" + Integer.toHexString(mDataDirectionIconId) + " mDataSignalIconId=0x" + Integer.toHexString(mDataSignalIconId) + + " mDataActiveSignalIconId=0x" + Integer.toHexString(mDataActiveSignalIconId) + " mDataTypeIconId=0x" + Integer.toHexString(mDataTypeIconId) + " mWifiIconId=0x" + Integer.toHexString(mWifiIconId) - + "mBluetoothTetherIconId=0x" + Integer.toHexString(mBluetoothTetherIconId)); + + " mBluetoothTetherIconId=0x" + Integer.toHexString(mBluetoothTetherIconId)); } // the phone icon on phones @@ -814,6 +834,10 @@ public class NetworkController extends BroadcastReceiver { pw.print(Integer.toHexString(mDataSignalIconId)); pw.print("/"); pw.println(getResourceName(mDataSignalIconId)); + pw.print(" mDataActiveSignalIconId="); + pw.print(Integer.toHexString(mDataActiveSignalIconId)); + pw.print("/"); + pw.println(getResourceName(mDataActiveSignalIconId)); pw.print(" mDataTypeIconId="); pw.print(Integer.toHexString(mDataTypeIconId)); pw.print("/"); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java index 94c68acea600..29d35e300516 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java @@ -50,6 +50,19 @@ class TelephonyIcons { static final int[][] DATA_SIGNAL_STRENGTH = TELEPHONY_SIGNAL_STRENGTH; + static final int[][] DATA_SIGNAL_STRENGTH_ACTIVE = { + { R.drawable.stat_sys_signal_0, + R.drawable.stat_sys_signal_1_flowing, + R.drawable.stat_sys_signal_2_flowing, + R.drawable.stat_sys_signal_3_flowing, + R.drawable.stat_sys_signal_4_flowing }, + { R.drawable.stat_sys_signal_0_fully, + R.drawable.stat_sys_signal_1_fully_flowing, + R.drawable.stat_sys_signal_2_fully_flowing, + R.drawable.stat_sys_signal_3_fully_flowing, + R.drawable.stat_sys_signal_4_fully_flowing } + }; + //***** Data connection icons //GSM/UMTS |
