Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 33e21fcc: Control H icon display in Status bar.

Browse Source 
Merge commit '33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-mr2

* commit '33e21fcc99dd91061ea245984c4e9a1544cb943f':
  Control H icon display in Status bar.
This commit is contained in:
John Wang
2009-10-08 17:30:12 -07:00
committed by Android Git Automerger
parent 94ee92600a 33e21fcc99
commit 2d4b58f29e
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/config.xml
View File

@@ -158,4 +158,6 @@
<!-- Allow the menu hard key to be disabled in LockScreen on some devices --> <!-- Allow the menu hard key to be disabled in LockScreen on some devices -->
<bool name="config_disableMenuKeyInLockScreen">false</bool> <bool name="config_disableMenuKeyInLockScreen">false</bool>
<!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices -->
<bool name="config_hspa_data_distinguishable">false</bool>
</resources> </resources>

15
services/java/com/android/server/status/StatusBarPolicy.java
View File

@@ -272,6 +272,7 @@ public class StatusBarPolicy {
private IBinder mDataIcon; private IBinder mDataIcon;
private IconData mDataData; private IconData mDataData;
private boolean mDataIconVisible; private boolean mDataIconVisible;
private boolean mHspaDataDistinguishable;
// ringer volume // ringer volume
private IBinder mVolumeIcon; private IBinder mVolumeIcon;
@@ -517,6 +518,14 @@ public class StatusBarPolicy {
filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED); filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
filter.addAction(TtyIntent.TTY_ENABLED_CHANGE_ACTION); filter.addAction(TtyIntent.TTY_ENABLED_CHANGE_ACTION);
mContext.registerReceiver(mIntentReceiver, filter, null, mHandler); mContext.registerReceiver(mIntentReceiver, filter, null, mHandler);
// load config to determine if to distinguish Hspa data icon
try {
mHspaDataDistinguishable = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_hspa_data_distinguishable);
} catch (Exception e) {
mHspaDataDistinguishable = false;
}
} }
public static void installIcons(Context context, StatusBarService service) { public static void installIcons(Context context, StatusBarService service) {
@@ -960,7 +969,11 @@ public class StatusBarPolicy {
case TelephonyManager.NETWORK_TYPE_HSDPA: case TelephonyManager.NETWORK_TYPE_HSDPA:
case TelephonyManager.NETWORK_TYPE_HSUPA: case TelephonyManager.NETWORK_TYPE_HSUPA:
case TelephonyManager.NETWORK_TYPE_HSPA: case TelephonyManager.NETWORK_TYPE_HSPA:
mDataIconList = sDataNetType_h; if (mHspaDataDistinguishable) {
mDataIconList = sDataNetType_h;
} else {
mDataIconList = sDataNetType_3g;
}
break; break;
case TelephonyManager.NETWORK_TYPE_CDMA: case TelephonyManager.NETWORK_TYPE_CDMA:
// display 1xRTT for IS95A/B // display 1xRTT for IS95A/B