diff options
Diffstat (limited to 'packages/SystemUI/src/com')
5 files changed, 61 insertions, 58 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java b/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java index d9447f7..6697751 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java @@ -18,8 +18,6 @@ package com.android.systemui.qs; import android.animation.ValueAnimator; import android.content.Context; -import android.graphics.ColorFilter; -import android.graphics.LightingColorFilter; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; @@ -31,7 +29,6 @@ import com.android.systemui.qs.QSTile.SignalState; public final class SignalTileView extends QSTileView { private static final long DEFAULT_DURATION = new ValueAnimator().getDuration(); private static final long SHORT_DURATION = DEFAULT_DURATION / 3; - private static final ColorFilter FILTER = new LightingColorFilter(0xffffffff, 0xff283034); private FrameLayout mIconFrame; private ImageView mSignal; @@ -49,7 +46,6 @@ public final class SignalTileView extends QSTileView { private ImageView addTrafficView(int icon) { final ImageView traffic = new ImageView(mContext); traffic.setImageResource(icon); - traffic.setColorFilter(FILTER); traffic.setAlpha(0f); addView(traffic); return traffic; @@ -95,12 +91,10 @@ public final class SignalTileView extends QSTileView { final SignalState s = (SignalState) state; mSignal.setImageDrawable(null); // force refresh mSignal.setImageResource(s.iconId); - mSignal.setColorFilter(s.filter ? FILTER : null); if (s.overlayIconId > 0) { mOverlay.setVisibility(VISIBLE); mOverlay.setImageDrawable(null); // force refresh mOverlay.setImageResource(s.overlayIconId); - mOverlay.setColorFilter(s.filter ? FILTER : null); } else { mOverlay.setVisibility(GONE); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index 8bae19a..fb13126 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -17,9 +17,6 @@ package com.android.systemui.statusbar; import android.content.Context; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffColorFilter; -import android.os.Build; import android.util.AttributeSet; import android.util.Log; import android.view.View; @@ -36,16 +33,13 @@ public class SignalClusterView extends LinearLayout implements NetworkControllerImpl.SignalCluster { - static final boolean DEBUG = false; static final String TAG = "SignalClusterView"; - static final PorterDuffColorFilter PROBLEM_FILTER - = new PorterDuffColorFilter(0xffab653b, PorterDuff.Mode.SRC_ATOP); + static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); NetworkControllerImpl mNC; private boolean mWifiVisible = false; private int mWifiStrengthId = 0; - private boolean mInetProblem; private boolean mMobileVisible = false; private int mMobileStrengthId = 0, mMobileTypeId = 0; private boolean mIsAirplaneMode = false; @@ -102,22 +96,19 @@ public class SignalClusterView } @Override - public void setWifiIndicators(boolean visible, int strengthIcon, boolean problem, - String contentDescription) { + public void setWifiIndicators(boolean visible, int strengthIcon, String contentDescription) { mWifiVisible = visible; mWifiStrengthId = strengthIcon; - mInetProblem = problem; mWifiDescription = contentDescription; apply(); } @Override - public void setMobileDataIndicators(boolean visible, int strengthIcon, boolean problem, - int typeIcon, String contentDescription, String typeContentDescription) { + public void setMobileDataIndicators(boolean visible, int strengthIcon, int typeIcon, + String contentDescription, String typeContentDescription) { mMobileVisible = visible; mMobileStrengthId = strengthIcon; - mInetProblem = problem; mMobileTypeId = typeIcon; mMobileDescription = contentDescription; mMobileTypeDescription = typeContentDescription; @@ -172,17 +163,12 @@ public class SignalClusterView return false; } - private void applyInetProblem(ImageView iv) { - iv.setColorFilter(Build.IS_DEBUGGABLE && mInetProblem ? PROBLEM_FILTER : null); - } - // Run after each indicator change. private void apply() { if (mWifiGroup == null) return; if (mWifiVisible) { mWifi.setImageResource(mWifiStrengthId); - applyInetProblem(mWifi); mWifiGroup.setContentDescription(mWifiDescription); mWifiGroup.setVisibility(View.VISIBLE); } else { @@ -197,7 +183,6 @@ public class SignalClusterView if (mMobileVisible && !mIsAirplaneMode) { mMobile.setImageResource(mMobileStrengthId); mMobileType.setImageResource(mMobileTypeId); - applyInetProblem(mMobile); mMobileGroup.setContentDescription(mMobileTypeDescription + " " + mMobileDescription); mMobileGroup.setVisibility(View.VISIBLE); } else { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 4fc2e06..70fe85f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -163,10 +163,9 @@ public class NetworkControllerImpl extends BroadcastReceiver boolean mDataAndWifiStacked = false; public interface SignalCluster { - void setWifiIndicators(boolean visible, int strengthIcon, boolean problem, - String contentDescription); - void setMobileDataIndicators(boolean visible, int strengthIcon, boolean problem, - int typeIcon, String contentDescription, String typeContentDescription); + void setWifiIndicators(boolean visible, int strengthIcon, String contentDescription); + void setMobileDataIndicators(boolean visible, int strengthIcon, int typeIcon, + String contentDescription, String typeContentDescription); void setIsAirplaneMode(boolean is, int airplaneIcon); } @@ -365,7 +364,6 @@ public class NetworkControllerImpl extends BroadcastReceiver // only show wifi in the cluster if connected or if wifi-only mWifiEnabled && (mWifiConnected || !mHasMobileDataFeature), mWifiIconId, - mInetCondition == 0, mContentDescriptionWifi); if (mIsWimaxEnabled && mWimaxConnected) { @@ -373,7 +371,6 @@ public class NetworkControllerImpl extends BroadcastReceiver cluster.setMobileDataIndicators( true, mAlwaysShowCdmaRssi ? mPhoneSignalIconId : mWimaxIconId, - mInetCondition == 0, mDataTypeIconId, mContentDescriptionWimax, mContentDescriptionDataType); @@ -382,7 +379,6 @@ public class NetworkControllerImpl extends BroadcastReceiver cluster.setMobileDataIndicators( mHasMobileDataFeature, mShowPhoneRSSIForData ? mPhoneSignalIconId : mDataSignalIconId, - mInetCondition == 0, mDataTypeIconId, mContentDescriptionPhoneSignal, mContentDescriptionDataType); @@ -599,6 +595,12 @@ public class NetworkControllerImpl extends BroadcastReceiver private final void updateTelephonySignalStrength() { Rlog.d(TAG, "updateTelephonySignalStrength: hasService=" + hasService() + " ss=" + mSignalStrength); + if (mDemoMode) { + mQSPhoneSignalIconId = mDemoMobileLevel < 0 ? R.drawable.ic_qs_signal_no_signal : + TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH[mDemoInetCondition][mDemoMobileLevel]; + mQSDataTypeIconId = mDemoQSDataTypeIconId; + return; + } if (!hasService()) { if (true/*CHATTY*/) Log.d(TAG, "updateTelephonySignalStrength: !hasService()"); mPhoneSignalIconId = R.drawable.stat_sys_signal_null; @@ -948,6 +950,11 @@ public class NetworkControllerImpl extends BroadcastReceiver } private void updateWifiIcons() { + if (mDemoMode) { + mQSWifiIconId = mDemoWifiLevel < 0 ? R.drawable.ic_qs_wifi_no_network + : WifiIcons.QS_WIFI_SIGNAL_STRENGTH[mDemoInetCondition][mDemoWifiLevel]; + return; + } if (mWifiConnected) { mWifiIconId = WifiIcons.WIFI_SIGNAL_STRENGTH[mInetCondition][mWifiLevel]; mQSWifiIconId = WifiIcons.QS_WIFI_SIGNAL_STRENGTH[mInetCondition][mWifiLevel]; @@ -1473,6 +1480,7 @@ public class NetworkControllerImpl extends BroadcastReceiver private int mDemoInetCondition; private int mDemoWifiLevel; private int mDemoDataTypeIconId; + private int mDemoQSDataTypeIconId; private int mDemoMobileLevel; @Override @@ -1482,12 +1490,16 @@ public class NetworkControllerImpl extends BroadcastReceiver mDemoWifiLevel = mWifiLevel; mDemoInetCondition = mInetCondition; mDemoDataTypeIconId = mDataTypeIconId; + mDemoQSDataTypeIconId = mQSDataTypeIconId; mDemoMobileLevel = mLastSignalLevel; } else if (mDemoMode && command.equals(COMMAND_EXIT)) { mDemoMode = false; for (SignalCluster cluster : mSignalClusters) { refreshSignalCluster(cluster); } + updateWifiIcons(); + updateTelephonySignalStrength(); + refreshViews(); } else if (mDemoMode && command.equals(COMMAND_NETWORK)) { String airplane = args.getString("airplane"); if (airplane != null) { @@ -1514,9 +1526,10 @@ public class NetworkControllerImpl extends BroadcastReceiver cluster.setWifiIndicators( show, iconId, - mDemoInetCondition == 0, "Demo"); } + updateWifiIcons(); + refreshViews(); } String mobile = args.getString("mobile"); if (mobile != null) { @@ -1534,6 +1547,16 @@ public class NetworkControllerImpl extends BroadcastReceiver datatype.equals("roam") ? R.drawable.stat_sys_data_fully_connected_roam : 0; + mDemoQSDataTypeIconId = + datatype.equals("1x") ? R.drawable.ic_qs_signal_1x : + datatype.equals("3g") ? R.drawable.ic_qs_signal_3g : + datatype.equals("4g") ? R.drawable.ic_qs_signal_4g : + datatype.equals("e") ? R.drawable.ic_qs_signal_e : + datatype.equals("g") ? R.drawable.ic_qs_signal_g : + datatype.equals("h") ? R.drawable.ic_qs_signal_h : + datatype.equals("lte") ? R.drawable.ic_qs_signal_lte : + datatype.equals("roam") ? R.drawable.ic_qs_signal_r : + 0; } int[][] icons = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH; String level = args.getString("level"); @@ -1547,11 +1570,12 @@ public class NetworkControllerImpl extends BroadcastReceiver cluster.setMobileDataIndicators( show, iconId, - mDemoInetCondition == 0, mDemoDataTypeIconId, "Demo", "Demo"); } + updateTelephonySignalStrength(); + refreshViews(); } } } 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 67ba879..84c53ce 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java @@ -23,11 +23,11 @@ class TelephonyIcons { //GSM/UMTS static final int[][] TELEPHONY_SIGNAL_STRENGTH = { - { R.drawable.stat_sys_signal_0_fully, - R.drawable.stat_sys_signal_1_fully, - R.drawable.stat_sys_signal_2_fully, - R.drawable.stat_sys_signal_3_fully, - R.drawable.stat_sys_signal_4_fully }, + { R.drawable.stat_sys_signal_0, + R.drawable.stat_sys_signal_1, + R.drawable.stat_sys_signal_2, + R.drawable.stat_sys_signal_3, + R.drawable.stat_sys_signal_4 }, { R.drawable.stat_sys_signal_0_fully, R.drawable.stat_sys_signal_1_fully, R.drawable.stat_sys_signal_2_fully, @@ -49,11 +49,11 @@ class TelephonyIcons { }; static final int[][] TELEPHONY_SIGNAL_STRENGTH_ROAMING = { - { R.drawable.stat_sys_signal_0_fully, - R.drawable.stat_sys_signal_1_fully, - R.drawable.stat_sys_signal_2_fully, - R.drawable.stat_sys_signal_3_fully, - R.drawable.stat_sys_signal_4_fully }, + { R.drawable.stat_sys_signal_0, + R.drawable.stat_sys_signal_1, + R.drawable.stat_sys_signal_2, + R.drawable.stat_sys_signal_3, + R.drawable.stat_sys_signal_4 }, { R.drawable.stat_sys_signal_0_fully, R.drawable.stat_sys_signal_1_fully, R.drawable.stat_sys_signal_2_fully, @@ -63,7 +63,7 @@ class TelephonyIcons { static final int[] QS_DATA_R = { R.drawable.ic_qs_signal_r, - R.drawable.ic_qs_signal_full_r + R.drawable.ic_qs_signal_r }; static final int[][] DATA_SIGNAL_STRENGTH = TELEPHONY_SIGNAL_STRENGTH; @@ -84,7 +84,7 @@ class TelephonyIcons { static final int[] QS_DATA_G = { R.drawable.ic_qs_signal_g, - R.drawable.ic_qs_signal_full_g + R.drawable.ic_qs_signal_g }; static final int[][] DATA_3G = { @@ -100,7 +100,7 @@ class TelephonyIcons { static final int[] QS_DATA_3G = { R.drawable.ic_qs_signal_3g, - R.drawable.ic_qs_signal_full_3g + R.drawable.ic_qs_signal_3g }; static final int[][] DATA_E = { @@ -116,7 +116,7 @@ class TelephonyIcons { static final int[] QS_DATA_E = { R.drawable.ic_qs_signal_e, - R.drawable.ic_qs_signal_full_e + R.drawable.ic_qs_signal_e }; //3.5G @@ -133,7 +133,7 @@ class TelephonyIcons { static final int[] QS_DATA_H = { R.drawable.ic_qs_signal_h, - R.drawable.ic_qs_signal_full_h + R.drawable.ic_qs_signal_h }; //CDMA @@ -151,7 +151,7 @@ class TelephonyIcons { static final int[] QS_DATA_1X = { R.drawable.ic_qs_signal_1x, - R.drawable.ic_qs_signal_full_1x + R.drawable.ic_qs_signal_1x }; // LTE and eHRPD @@ -168,7 +168,7 @@ class TelephonyIcons { static final int[] QS_DATA_4G = { R.drawable.ic_qs_signal_4g, - R.drawable.ic_qs_signal_full_4g + R.drawable.ic_qs_signal_4g }; // LTE branded "LTE" @@ -185,7 +185,7 @@ class TelephonyIcons { static final int[] QS_DATA_LTE = { R.drawable.ic_qs_signal_lte, - R.drawable.ic_qs_signal_full_lte + R.drawable.ic_qs_signal_lte }; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java index 57ddf7a..49af979 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java @@ -21,11 +21,11 @@ import com.android.systemui.R; class WifiIcons { static final int[][] WIFI_SIGNAL_STRENGTH = { { R.drawable.stat_sys_wifi_signal_0, - R.drawable.stat_sys_wifi_signal_1_fully, - R.drawable.stat_sys_wifi_signal_2_fully, - R.drawable.stat_sys_wifi_signal_3_fully, - R.drawable.stat_sys_wifi_signal_4_fully }, - { R.drawable.stat_sys_wifi_signal_0, + R.drawable.stat_sys_wifi_signal_1, + R.drawable.stat_sys_wifi_signal_2, + R.drawable.stat_sys_wifi_signal_3, + R.drawable.stat_sys_wifi_signal_4 }, + { R.drawable.stat_sys_wifi_signal_0_fully, R.drawable.stat_sys_wifi_signal_1_fully, R.drawable.stat_sys_wifi_signal_2_fully, R.drawable.stat_sys_wifi_signal_3_fully, @@ -38,7 +38,7 @@ class WifiIcons { R.drawable.ic_qs_wifi_2, R.drawable.ic_qs_wifi_3, R.drawable.ic_qs_wifi_4 }, - { R.drawable.ic_qs_wifi_0, + { R.drawable.ic_qs_wifi_full_0, R.drawable.ic_qs_wifi_full_1, R.drawable.ic_qs_wifi_full_2, R.drawable.ic_qs_wifi_full_3, |