am d7bf6d46: Merge "Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView" into jb-mr2-dev

* commit 'd7bf6d46bd636991885662da5e710b1cf08a44d8':
  Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView
This commit is contained in:
Fabrice Di Meglio
2013-05-08 11:17:23 -07:00
committed by Android Git Automerger

View File

@@ -143,14 +143,39 @@ public class SignalClusterView
return super.dispatchPopulateAccessibilityEvent(event); return super.dispatchPopulateAccessibilityEvent(event);
} }
@Override
public void onRtlPropertiesChanged(int layoutDirection) {
super.onRtlPropertiesChanged(layoutDirection);
if (mWifi != null) {
mWifi.setImageDrawable(null);
}
if (mWifiActivity != null) {
mWifiActivity.setImageDrawable(null);
}
if (mMobile != null) {
mMobile.setImageDrawable(null);
}
if (mMobileActivity != null) {
mMobileActivity.setImageDrawable(null);
}
if (mMobileType != null) {
mMobileType.setImageDrawable(null);
}
if(mAirplane != null) {
mAirplane.setImageDrawable(null);
}
apply();
}
// Run after each indicator change. // Run after each indicator change.
private void apply() { private void apply() {
if (mWifiGroup == null) return; if (mWifiGroup == null) return;
if (mWifiVisible) { if (mWifiVisible) {
mWifi.setImageDrawable(null);
mWifiActivity.setImageDrawable(null);
mWifi.setImageResource(mWifiStrengthId); mWifi.setImageResource(mWifiStrengthId);
mWifiActivity.setImageResource(mWifiActivityId); mWifiActivity.setImageResource(mWifiActivityId);
@@ -166,10 +191,6 @@ public class SignalClusterView
mWifiStrengthId, mWifiActivityId)); mWifiStrengthId, mWifiActivityId));
if (mMobileVisible && !mIsAirplaneMode) { if (mMobileVisible && !mIsAirplaneMode) {
mMobile.setImageDrawable(null);
mMobileActivity.setImageDrawable(null);
mMobileType.setImageDrawable(null);
mMobile.setImageResource(mMobileStrengthId); mMobile.setImageResource(mMobileStrengthId);
mMobileActivity.setImageResource(mMobileActivityId); mMobileActivity.setImageResource(mMobileActivityId);
mMobileType.setImageResource(mMobileTypeId); mMobileType.setImageResource(mMobileTypeId);
@@ -181,7 +202,6 @@ public class SignalClusterView
} }
if (mIsAirplaneMode) { if (mIsAirplaneMode) {
mAirplane.setImageDrawable(null);
mAirplane.setImageResource(mAirplaneIconId); mAirplane.setImageResource(mAirplaneIconId);
mAirplane.setVisibility(View.VISIBLE); mAirplane.setVisibility(View.VISIBLE);
} else { } else {