From 347c5a22a915df5aa180573573adf6b2213a35dc Mon Sep 17 00:00:00 2001 From: johnwang Date: Mon, 24 Aug 2009 22:11:11 -0700 Subject: [PATCH] Simplify CDMA Status Bar icons Update the RSSI display policy in CDMA. 1. Use single RSSI icon instead of two icons 2. If 3G(EV) and 1x network are available than 3G should be displayed, Displayed RSSI should be from the EV side. 3. If a voice call is made then RSSI should switch to 1x. --- .../res/drawable/stat_sys_signal_0_cdma.png | Bin 701 -> 0 bytes .../res/drawable/stat_sys_signal_1_cdma.png | Bin 714 -> 0 bytes .../res/drawable/stat_sys_signal_2_cdma.png | Bin 706 -> 0 bytes .../res/drawable/stat_sys_signal_3_cdma.png | Bin 702 -> 0 bytes .../res/drawable/stat_sys_signal_4_cdma.png | Bin 621 -> 0 bytes .../res/drawable/stat_sys_signal_cdma_0.png | Bin 701 -> 0 bytes .../res/drawable/stat_sys_signal_cdma_1.png | Bin 714 -> 0 bytes .../res/drawable/stat_sys_signal_cdma_2.png | Bin 706 -> 0 bytes .../res/drawable/stat_sys_signal_cdma_3.png | Bin 702 -> 0 bytes .../res/drawable/stat_sys_signal_cdma_4.png | Bin 621 -> 0 bytes .../res/drawable/stat_sys_signal_evdo_0.png | Bin 912 -> 0 bytes .../res/drawable/stat_sys_signal_evdo_1.png | Bin 925 -> 0 bytes .../res/drawable/stat_sys_signal_evdo_2.png | Bin 904 -> 0 bytes .../res/drawable/stat_sys_signal_evdo_3.png | Bin 907 -> 0 bytes .../res/drawable/stat_sys_signal_evdo_4.png | Bin 823 -> 0 bytes .../server/status/StatusBarPolicy.java | 156 ++++++++---------- 16 files changed, 72 insertions(+), 84 deletions(-) delete mode 100644 core/res/res/drawable/stat_sys_signal_0_cdma.png delete mode 100644 core/res/res/drawable/stat_sys_signal_1_cdma.png delete mode 100644 core/res/res/drawable/stat_sys_signal_2_cdma.png delete mode 100644 core/res/res/drawable/stat_sys_signal_3_cdma.png delete mode 100644 core/res/res/drawable/stat_sys_signal_4_cdma.png delete mode 100755 core/res/res/drawable/stat_sys_signal_cdma_0.png delete mode 100755 core/res/res/drawable/stat_sys_signal_cdma_1.png delete mode 100755 core/res/res/drawable/stat_sys_signal_cdma_2.png delete mode 100755 core/res/res/drawable/stat_sys_signal_cdma_3.png delete mode 100755 core/res/res/drawable/stat_sys_signal_cdma_4.png delete mode 100755 core/res/res/drawable/stat_sys_signal_evdo_0.png delete mode 100755 core/res/res/drawable/stat_sys_signal_evdo_1.png delete mode 100755 core/res/res/drawable/stat_sys_signal_evdo_2.png delete mode 100755 core/res/res/drawable/stat_sys_signal_evdo_3.png delete mode 100755 core/res/res/drawable/stat_sys_signal_evdo_4.png diff --git a/core/res/res/drawable/stat_sys_signal_0_cdma.png b/core/res/res/drawable/stat_sys_signal_0_cdma.png deleted file mode 100644 index 0ef7d534c3711c039d13ffec19c575592eb98868..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 701 zcmV;u0z&P000>X1^@s6#OZ}&00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOV; z3=Jv!2YieG00KQpL_t(Y$K92`s^UNt#=ne4EF`EHP zX~lFp4MGSw=dqHTrU}C^u;1^o+wE|xA1)*R}jV+2q74aM(FqZu`2O>ADnY!G8r(&z!-~$1kZ6o2q9s2A&Q~^04Sxg zAfD#|066EMl)eplq!QbyZcMoBs(Lk+M z!)mpgy+PGSHx=8q1SuU3_O%sme$i;Cq zMNzJLq5wdtRQgpY6u#{D``EW|5UQ%eFbtedr{9Oe;j8RPyWM`SR;xdf$z<^({_&pY j{aLTq&*SkJpDX?XUfn#o9SX>100000NkvXXu0mjf{6#T; diff --git a/core/res/res/drawable/stat_sys_signal_1_cdma.png b/core/res/res/drawable/stat_sys_signal_1_cdma.png deleted file mode 100644 index f4839d4954fea0a9d07718b2ede327e602821b13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 714 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 Hu0mjf4RZ!^ diff --git a/core/res/res/drawable/stat_sys_signal_cdma_0.png b/core/res/res/drawable/stat_sys_signal_cdma_0.png deleted file mode 100755 index 0ef7d534c3711c039d13ffec19c575592eb98868..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 701 zcmV;u0z&P000>X1^@s6#OZ}&00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOV; z3=Jv!2YieG00KQpL_t(Y$K92`s^UNt#=ne4EF`EHP zX~lFp4MGSw=dqHTrU}C^u;1^o+wE|xA1)*R}jV+2q74aM(FqZu`2O>ADnY!G8r(&z!-~$1kZ6o2q9s2A&Q~^04Sxg zAfD#|066EMl)eplq!QbyZcMoBs(Lk+M z!)mpgy+PGSHx=8q1SuU3_O%sme$i;Cq zMNzJLq5wdtRQgpY6u#{D``EW|5UQ%eFbtedr{9Oe;j8RPyWM`SR;xdf$z<^({_&pY j{aLTq&*SkJpDX?XUfn#o9SX>100000NkvXXu0mjf{6#T; diff --git a/core/res/res/drawable/stat_sys_signal_cdma_1.png b/core/res/res/drawable/stat_sys_signal_cdma_1.png deleted file mode 100755 index f4839d4954fea0a9d07718b2ede327e602821b13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 714 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 Hu0mjf4RZ!^ diff --git a/core/res/res/drawable/stat_sys_signal_evdo_0.png b/core/res/res/drawable/stat_sys_signal_evdo_0.png deleted file mode 100755 index 1b8aec7cfc806ba03a968847cf54c9eb1b765cac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 912 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 diff --git a/core/res/res/drawable/stat_sys_signal_evdo_4.png b/core/res/res/drawable/stat_sys_signal_evdo_4.png deleted file mode 100755 index f0537ddd847259fb001ecc916ac8d0af87447aaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 823 zcmV-71IYY|P)P000>X1^@s6#OZ}&00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXM% z2Qm=h=4E>T00Os3L_t(Y$Gw!nOB+EH#(z7zf#gsykU+IPc@&|y5~T+bti)iX9xPQ* zTGM}_m)y)>P_Io|5K?Lm9ts}Bi=`65UUT-;Y7c>kIqbMQ+3g|S&2ExvB5fZGv-8cH z_r34U+tH?;OmSJiL@G&?D3T#&Bg#l(gzDESH<=NS#~DqIy77@X(P*?yW(+V(N#nAC zRMG+Tn@F_P7puggF?V5cf#qk*Jr227Ig0O#{x=X>o6-c}^xLU_MhJ15OeWtPA0K}K zFuaX^1jE?u>?{DbZPREp9^1D42^a-1q>>;z&TFe{9cmR0WJ)uTR(tK0Z)0PF>FH^z z)hfke5h>+;Ul|Id>adhQmMQO)LALSWo>USk!)q_WR4V1qj^p6EZl`=w%ASn<0IIE~ zdDZMF`|aDjYJ!4`#syMIgb?0+VB0pfZFjn>yIh%UCQKSA&-%-CaQY-7!wL3~pg;z^ z_CN234rHEYsO(l)dA`EZ;*zhTvReTOv3oIEq7^!0SyqTdn5GE|O7BX2yQX0_DD9Nk ze!J~sTZJt)UvDz;XadtTLjn6K(OlPMW@g5XL?Q#X>%qYRLI@nkVSaudfWyN>e}8Un z4%@alIy%z)id&Wy>W14ac*&M!_3U?-%kbn4L((0vAEs2Ndj!Ds_4OY|KA-30c$OjeSof5)aPK&idAP7>h(AjE|2~uh)N^pPxVU z%aux{a+8yj9}L5|&tEX5)X!S2mJ2EQ*CzN6_6vc5LCb_#%>4iW002ovPDHLkV1hK| BdRhPg diff --git a/services/java/com/android/server/status/StatusBarPolicy.java b/services/java/com/android/server/status/StatusBarPolicy.java index c6b085dd57288..65b2ddb4075ce 100644 --- a/services/java/com/android/server/status/StatusBarPolicy.java +++ b/services/java/com/android/server/status/StatusBarPolicy.java @@ -105,11 +105,9 @@ public class StatusBarPolicy { // phone private TelephonyManager mPhone; private IBinder mPhoneIcon; - private IBinder mPhoneEvdoIcon; //***** Signal strength icons private IconData mPhoneData; - private IconData mPhoneEvdoData; //GSM/UMTS private static final int[] sSignalImages = new int[] { com.android.internal.R.drawable.stat_sys_signal_0, @@ -125,14 +123,6 @@ public class StatusBarPolicy { com.android.internal.R.drawable.stat_sys_r_signal_3, com.android.internal.R.drawable.stat_sys_r_signal_4 }; - //CDMA - private static final int[] sSignalImages_cdma = new int[] { - com.android.internal.R.drawable.stat_sys_signal_cdma_0, - com.android.internal.R.drawable.stat_sys_signal_cdma_1, - com.android.internal.R.drawable.stat_sys_signal_cdma_2, - com.android.internal.R.drawable.stat_sys_signal_cdma_3, - com.android.internal.R.drawable.stat_sys_signal_cdma_4 - }; private static final int[] sRoamingIndicatorImages_cdma = new int[] { com.android.internal.R.drawable.stat_sys_roaming_cdma_0, //Standard Roaming Indicator // 1 is Standard Roaming Indicator OFF @@ -232,14 +222,6 @@ public class StatusBarPolicy { // 128-255 Reserved }; - // EVDO - private static final int[] sSignalImages_evdo = new int[] { - com.android.internal.R.drawable.stat_sys_signal_evdo_0, - com.android.internal.R.drawable.stat_sys_signal_evdo_1, - com.android.internal.R.drawable.stat_sys_signal_evdo_2, - com.android.internal.R.drawable.stat_sys_signal_evdo_3, - com.android.internal.R.drawable.stat_sys_signal_evdo_4 - }; //***** Data connection icons private int[] mDataIconList = sDataNetType_g; @@ -438,12 +420,6 @@ public class StatusBarPolicy { null, com.android.internal.R.drawable.stat_sys_signal_null, 0, 0); mPhoneIcon = service.addIcon(mPhoneData, null); - // phone_evdo_signal - mPhoneEvdoData = IconData.makeIcon("phone_evdo_signal", - null, com.android.internal.R.drawable.stat_sys_signal_evdo_0, 0, 0); - mPhoneEvdoIcon = service.addIcon(mPhoneEvdoData, null); - service.setIconVisibility(mPhoneEvdoIcon, false); - // register for phone state notifications. ((TelephonyManager)mContext.getSystemService(Context.TELEPHONY_SERVICE)) .listen(mPhoneStateListener, @@ -499,7 +475,7 @@ public class StatusBarPolicy { mGpsFixIconData = IconData.makeIcon("gps", null, com.android.internal.R.drawable.stat_sys_gps_on, 0, 0); mGpsIcon = service.addIcon(mGpsEnabledIconData, null); - service.setIconVisibility(mGpsIcon, false); + service.setIconVisibility(mGpsIcon, false); // Alarm clock mAlarmClockIconData = IconData.makeIcon( @@ -522,7 +498,7 @@ public class StatusBarPolicy { mVolumeIcon = service.addIcon(mVolumeData, null); service.setIconVisibility(mVolumeIcon, false); updateVolume(); - + IntentFilter filter = new IntentFilter(); // Register for Intent broadcasts for... @@ -642,7 +618,7 @@ public class StatusBarPolicy { } } - private void showBatteryView() { + private void showBatteryView() { closeLastBatteryView(); if (mLowBatteryDialog != null) { mLowBatteryDialog.dismiss(); @@ -723,7 +699,7 @@ public class StatusBarPolicy { b.setView(v); b.setIcon(android.R.drawable.ic_dialog_alert); b.setPositiveButton(android.R.string.ok, null); - + final Intent intent = new Intent(Intent.ACTION_POWER_USAGE_SUMMARY); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK @@ -811,6 +787,10 @@ public class StatusBarPolicy { @Override public void onCallStateChanged(int state, String incomingNumber) { updateCallState(state); + // In cdma, if a voice call is made, RSSI should switch to 1x. + if (isCdma()) { + updateSignalStrength(); + } } @Override @@ -839,7 +819,7 @@ public class StatusBarPolicy { final String lockedReason = intent.getStringExtra(IccCard.INTENT_KEY_LOCKED_REASON); if (IccCard.INTENT_VALUE_LOCKED_ON_PIN.equals(lockedReason)) { mSimState = IccCard.State.PIN_REQUIRED; - } + } else if (IccCard.INTENT_VALUE_LOCKED_ON_PUK.equals(lockedReason)) { mSimState = IccCard.State.PUK_REQUIRED; } @@ -856,6 +836,14 @@ public class StatusBarPolicy { return ((mPhone != null) && (mPhone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA)); } + private boolean isEvdo() { + return ( (mServiceState != null) + && ((mServiceState.getRadioTechnology() + == ServiceState.RADIO_TECHNOLOGY_EVDO_0) + || (mServiceState.getRadioTechnology() + == ServiceState.RADIO_TECHNOLOGY_EVDO_A))); + } + private boolean hasService() { if (mServiceState != null) { switch (mServiceState.getState()) { @@ -872,9 +860,7 @@ public class StatusBarPolicy { private final void updateSignalStrength() { int iconLevel = -1; - int evdoIconLevel = -1; int[] iconList; - int[] evdoIconList; if (!hasService()) { //Log.d(TAG, "updateSignalStrength: no service"); @@ -885,7 +871,6 @@ public class StatusBarPolicy { mPhoneData.iconId = com.android.internal.R.drawable.stat_sys_signal_null; } mService.updateIcon(mPhoneIcon, mPhoneData, null); - mService.setIconVisibility(mPhoneEvdoIcon,false); return; } @@ -908,64 +893,67 @@ public class StatusBarPolicy { iconList = sSignalImages; } } else { - iconList = this.sSignalImages_cdma; + iconList = this.sSignalImages; - int cdmaDbm = mSignalStrength.getCdmaDbm(); - int cdmaEcio = mSignalStrength.getCdmaEcio(); - int levelDbm = 0; - int levelEcio = 0; - - if (cdmaDbm >= -75) levelDbm = 4; - else if (cdmaDbm >= -85) levelDbm = 3; - else if (cdmaDbm >= -95) levelDbm = 2; - else if (cdmaDbm >= -100) levelDbm = 1; - else levelDbm = 0; - - // Ec/Io are in dB*10 - if (cdmaEcio >= -90) levelEcio = 4; - else if (cdmaEcio >= -110) levelEcio = 3; - else if (cdmaEcio >= -130) levelEcio = 2; - else if (cdmaEcio >= -150) levelEcio = 1; - else levelEcio = 0; - - iconLevel = (levelDbm < levelEcio) ? levelDbm : levelEcio; + // If 3G(EV) and 1x network are available than 3G should be + // displayed, displayed RSSI should be from the EV side. + // If a voice call is made then RSSI should switch to 1x. + if ((mPhoneState == TelephonyManager.CALL_STATE_IDLE) && isEvdo()){ + iconLevel = getEvdoLevel(); + if (false) { + Log.d(TAG, "use Evdo level=" + iconLevel + " to replace Cdma Level=" + getCdmaLevel()); + } + } else { + iconLevel = getCdmaLevel(); + } } - - if ((mServiceState.getRadioTechnology() == ServiceState.RADIO_TECHNOLOGY_EVDO_0) - || (mServiceState.getRadioTechnology() == ServiceState.RADIO_TECHNOLOGY_EVDO_A)) { - // Use Evdo icon - evdoIconList = this.sSignalImages_evdo; - - int evdoDbm = mSignalStrength.getEvdoDbm(); - int evdoSnr = mSignalStrength.getEvdoSnr(); - int levelEvdoDbm = 0; - int levelEvdoSnr = 0; - - if (evdoDbm >= -65) levelEvdoDbm = 4; - else if (evdoDbm >= -75) levelEvdoDbm = 3; - else if (evdoDbm >= -90) levelEvdoDbm = 2; - else if (evdoDbm >= -105) levelEvdoDbm = 1; - else levelEvdoDbm = 0; - - if (evdoSnr > 7) levelEvdoSnr = 4; - else if (evdoSnr > 5) levelEvdoSnr = 3; - else if (evdoSnr > 3) levelEvdoSnr = 2; - else if (evdoSnr > 1) levelEvdoSnr = 1; - else levelEvdoSnr = 0; - - evdoIconLevel = (levelEvdoDbm < levelEvdoSnr) ? levelEvdoDbm : levelEvdoSnr; - - mPhoneEvdoData.iconId = evdoIconList[evdoIconLevel]; - mService.updateIcon(mPhoneEvdoIcon, mPhoneEvdoData, null); - mService.setIconVisibility(mPhoneEvdoIcon,true); - } else { - mService.setIconVisibility(mPhoneEvdoIcon,false); - } - mPhoneData.iconId = iconList[iconLevel]; mService.updateIcon(mPhoneIcon, mPhoneData, null); } + private int getCdmaLevel() { + final int cdmaDbm = mSignalStrength.getCdmaDbm(); + final int cdmaEcio = mSignalStrength.getCdmaEcio(); + int levelDbm = 0; + int levelEcio = 0; + + if (cdmaDbm >= -75) levelDbm = 4; + else if (cdmaDbm >= -85) levelDbm = 3; + else if (cdmaDbm >= -95) levelDbm = 2; + else if (cdmaDbm >= -100) levelDbm = 1; + else levelDbm = 0; + + // Ec/Io are in dB*10 + if (cdmaEcio >= -90) levelEcio = 4; + else if (cdmaEcio >= -110) levelEcio = 3; + else if (cdmaEcio >= -130) levelEcio = 2; + else if (cdmaEcio >= -150) levelEcio = 1; + else levelEcio = 0; + + return (levelDbm < levelEcio) ? levelDbm : levelEcio; + } + + private int getEvdoLevel() { + int evdoDbm = mSignalStrength.getEvdoDbm(); + int evdoSnr = mSignalStrength.getEvdoSnr(); + int levelEvdoDbm = 0; + int levelEvdoSnr = 0; + + if (evdoDbm >= -65) levelEvdoDbm = 4; + else if (evdoDbm >= -75) levelEvdoDbm = 3; + else if (evdoDbm >= -90) levelEvdoDbm = 2; + else if (evdoDbm >= -105) levelEvdoDbm = 1; + else levelEvdoDbm = 0; + + if (evdoSnr > 7) levelEvdoSnr = 4; + else if (evdoSnr > 5) levelEvdoSnr = 3; + else if (evdoSnr > 3) levelEvdoSnr = 2; + else if (evdoSnr > 1) levelEvdoSnr = 1; + else levelEvdoSnr = 0; + + return (levelEvdoDbm < levelEvdoSnr) ? levelEvdoDbm : levelEvdoSnr; + } + private final void updateDataNetType() { int net = mPhone.getNetworkType();