diff options
| author | John Wang <johnwang@google.com> | 2009-10-08 17:30:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-08 17:30:12 -0700 |
| commit | 2d4b58f29eda24fe5ec1dd1850823a9e7bddacc6 (patch) | |
| tree | 412d1e4896b2cf347831b32329a8a01036af94b6 | |
| parent | 94ee92600a13f4d58afa61215c69fb60b989f6f3 (diff) | |
| parent | 33e21fcc99dd91061ea245984c4e9a1544cb943f (diff) | |
| download | frameworks_base-2d4b58f29eda24fe5ec1dd1850823a9e7bddacc6.zip frameworks_base-2d4b58f29eda24fe5ec1dd1850823a9e7bddacc6.tar.gz frameworks_base-2d4b58f29eda24fe5ec1dd1850823a9e7bddacc6.tar.bz2 | |
am 33e21fcc: Control H icon display in Status bar.
Merge commit '33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-mr2
* commit '33e21fcc99dd91061ea245984c4e9a1544cb943f':
Control H icon display in Status bar.
| -rw-r--r-- | core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/status/StatusBarPolicy.java | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 9040edb..6fd7657 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -158,4 +158,6 @@ <!-- Allow the menu hard key to be disabled in LockScreen on some devices --> <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> diff --git a/services/java/com/android/server/status/StatusBarPolicy.java b/services/java/com/android/server/status/StatusBarPolicy.java index 3d1fb83..d590c40 100644 --- a/services/java/com/android/server/status/StatusBarPolicy.java +++ b/services/java/com/android/server/status/StatusBarPolicy.java @@ -272,6 +272,7 @@ public class StatusBarPolicy { private IBinder mDataIcon; private IconData mDataData; private boolean mDataIconVisible; + private boolean mHspaDataDistinguishable; // ringer volume private IBinder mVolumeIcon; @@ -517,6 +518,14 @@ public class StatusBarPolicy { filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED); filter.addAction(TtyIntent.TTY_ENABLED_CHANGE_ACTION); 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) { @@ -960,7 +969,11 @@ public class StatusBarPolicy { case TelephonyManager.NETWORK_TYPE_HSDPA: case TelephonyManager.NETWORK_TYPE_HSUPA: case TelephonyManager.NETWORK_TYPE_HSPA: - mDataIconList = sDataNetType_h; + if (mHspaDataDistinguishable) { + mDataIconList = sDataNetType_h; + } else { + mDataIconList = sDataNetType_3g; + } break; case TelephonyManager.NETWORK_TYPE_CDMA: // display 1xRTT for IS95A/B |