summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
diff options
context:
space:
mode:
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java122
1 files changed, 6 insertions, 116 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
index e22b94c..b0fc398 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar;
import android.content.Context;
import android.content.res.ColorStateList;
-import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.drawable.Animatable;
@@ -68,8 +67,8 @@ public class SignalClusterView
private int mEthernetIconId = 0;
private int mLastEthernetIconId = -1;
private boolean mWifiVisible = false;
- private int mWifiStrengthId = 0, mWifiActivityId = 0;
- private int mLastWifiStrengthId = -1, mLastWifiActivityId = -1;
+ private int mWifiStrengthId = 0;
+ private int mLastWifiStrengthId = -1;
private boolean mIsAirplaneMode = false;
private int mAirplaneIconId = 0;
private int mLastAirplaneIconId = -1;
@@ -79,12 +78,10 @@ public class SignalClusterView
private ArrayList<PhoneState> mPhoneStates = new ArrayList<PhoneState>();
private int mIconTint = Color.WHITE;
private float mDarkIntensity;
- private int mNoSimsIcon;
ViewGroup mEthernetGroup, mWifiGroup;
View mNoSimsCombo;
ImageView mVpn, mEthernet, mWifi, mAirplane, mNoSims, mEthernetDark, mWifiDark, mNoSimsDark;
- ImageView mWifiActivity;
View mWifiAirplaneSpacer;
View mWifiSignalSpacer;
LinearLayout mMobileSignalGroup;
@@ -164,7 +161,6 @@ public class SignalClusterView
mWifiGroup = (ViewGroup) findViewById(R.id.wifi_combo);
mWifi = (ImageView) findViewById(R.id.wifi_signal);
mWifiDark = (ImageView) findViewById(R.id.wifi_signal_dark);
- mWifiActivity = (ImageView) findViewById(R.id.wifi_inout);
mAirplane = (ImageView) findViewById(R.id.airplane);
mNoSims = (ImageView) findViewById(R.id.no_sims);
mNoSimsDark = (ImageView) findViewById(R.id.no_sims_dark);
@@ -188,7 +184,6 @@ public class SignalClusterView
mEthernet = null;
mWifiGroup = null;
mWifi = null;
- mWifiActivity = null;
mAirplane = null;
mMobileSignalGroup.removeAllViews();
mMobileSignalGroup = null;
@@ -214,7 +209,6 @@ public class SignalClusterView
boolean activityIn, boolean activityOut, String description) {
mWifiVisible = statusIcon.visible && !mBlockWifi;
mWifiStrengthId = statusIcon.icon;
- mWifiActivityId = getWifiActivityId(activityIn, activityOut);
mWifiDescription = statusIcon.contentDescription;
apply();
@@ -222,9 +216,8 @@ public class SignalClusterView
@Override
public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType,
- int qsType, boolean activityIn, boolean activityOut, int dataActivityId,
- int mobileActivityId, int stackedDataId, int stackedVoiceId,
- String typeContentDescription, String description, boolean isWide, int subId) {
+ int qsType, boolean activityIn, boolean activityOut, String typeContentDescription,
+ String description, boolean isWide, int subId) {
PhoneState state = getState(subId);
if (state == null) {
return;
@@ -235,10 +228,6 @@ public class SignalClusterView
state.mMobileDescription = statusIcon.contentDescription;
state.mMobileTypeDescription = typeContentDescription;
state.mIsMobileTypeIconWide = statusType != 0 && isWide;
- state.mDataActivityId = dataActivityId;
- state.mMobileActivityId = mobileActivityId;
- state.mStackedDataId = stackedDataId;
- state.mStackedVoiceId = stackedVoiceId;
apply();
}
@@ -300,43 +289,6 @@ public class SignalClusterView
return null;
}
-
- private int getWifiActivityId(boolean activityIn, boolean activityOut) {
- if (!getContext().getResources().getBoolean(R.bool.config_showWifiActivity)) {
- return 0;
- }
- int activityId = 0;
- if (activityIn && activityOut) {
- activityId = R.drawable.stat_sys_wifi_inout;
- } else if (activityIn) {
- activityId = R.drawable.stat_sys_wifi_in;
- } else if (activityOut) {
- activityId = R.drawable.stat_sys_wifi_out;
- }
- return activityId;
- }
-
- private int getNoSimIcon() {
- int resId = 0;
- final String[] noSimArray;
- Resources res = getContext().getResources();
-
- if (!res.getBoolean(R.bool.config_read_icons_from_xml)) return resId;
-
- try {
- noSimArray = res.getStringArray(R.array.multi_no_sim);
- } catch (android.content.res.Resources.NotFoundException e) {
- return resId;
- }
-
- if (noSimArray == null) return resId;
-
- String resName = noSimArray[0];
- resId = res.getIdentifier(resName, null, getContext().getPackageName());
- if (DEBUG) Log.d(TAG, "getNoSimIcon resId = " + resId + " resName = " + resName);
- return resId;
- }
-
private PhoneState inflatePhoneState(int subId) {
PhoneState state = new PhoneState(subId, mContext);
if (mMobileSignalGroup != null) {
@@ -391,11 +343,6 @@ public class SignalClusterView
mLastWifiStrengthId = -1;
}
- if (mWifiActivity != null) {
- mWifiActivity.setImageDrawable(null);
- mLastWifiActivityId = -1;
- }
-
for (PhoneState state : mPhoneStates) {
if (state.mMobile != null) {
state.mMobile.setImageDrawable(null);
@@ -448,10 +395,6 @@ public class SignalClusterView
mWifiDark.setImageResource(mWifiStrengthId);
mLastWifiStrengthId = mWifiStrengthId;
}
- if (mWifiActivityId != mLastWifiActivityId) {
- mWifiActivity.setImageResource(mWifiActivityId);
- mLastWifiActivityId = mWifiActivityId;
- }
mWifiGroup.setContentDescription(mWifiDescription);
mWifiGroup.setVisibility(View.VISIBLE);
} else {
@@ -459,9 +402,9 @@ public class SignalClusterView
}
if (DEBUG) Log.d(TAG,
- String.format("wifi: %s sig=%d act=%d",
+ String.format("wifi: %s sig=%d",
(mWifiVisible ? "VISIBLE" : "GONE"),
- mWifiStrengthId, mWifiActivityId));
+ mWifiStrengthId));
boolean anyMobileVisible = false;
int firstMobileTypeId = 0;
@@ -497,13 +440,6 @@ public class SignalClusterView
mWifiSignalSpacer.setVisibility(View.GONE);
}
- if (mNoSimsVisible && mNoSims != null && mNoSimsDark != null) {
- if (mNoSimsIcon == 0) mNoSimsIcon = getNoSimIcon();
- if (mNoSimsIcon != 0) {
- mNoSims.setImageResource(mNoSimsIcon);
- mNoSimsDark.setImageResource(mNoSimsIcon);
- }
- }
mNoSimsCombo.setVisibility(mNoSimsVisible ? View.VISIBLE : View.GONE);
}
@@ -546,11 +482,6 @@ public class SignalClusterView
private ViewGroup mMobileGroup;
private ImageView mMobile, mMobileDark, mMobileType;
- private int mDataActivityId = 0, mMobileActivityId = 0;
- private int mStackedDataId = 0, mStackedVoiceId = 0;
- private ImageView mDataActivity, mMobileActivity, mStackedData, mStackedVoice;
- private ViewGroup mMobileSingleGroup, mMobileStackedGroup;
-
public PhoneState(int subId, Context context) {
ViewGroup root = (ViewGroup) LayoutInflater.from(context)
.inflate(R.layout.mobile_signal_group, null);
@@ -563,14 +494,6 @@ public class SignalClusterView
mMobile = (ImageView) root.findViewById(R.id.mobile_signal);
mMobileDark = (ImageView) root.findViewById(R.id.mobile_signal_dark);
mMobileType = (ImageView) root.findViewById(R.id.mobile_type);
- mMobileActivity = (ImageView) root.findViewById(R.id.mobile_inout);
-
- mDataActivity = (ImageView) root.findViewById(R.id.data_inout);
- mStackedData = (ImageView) root.findViewById(R.id.mobile_signal_data);
- mStackedVoice = (ImageView) root.findViewById(R.id.mobile_signal_voice);
-
- mMobileSingleGroup = (ViewGroup) root.findViewById(R.id.mobile_signal_single);
- mMobileStackedGroup = (ViewGroup) root.findViewById(R.id.mobile_signal_stacked);
}
public boolean apply(boolean isSecondaryIcon) {
@@ -594,37 +517,6 @@ public class SignalClusterView
}
mMobileType.setImageResource(mMobileTypeId);
-
- mDataActivity.setImageResource(mDataActivityId);
- Drawable dataActivityDrawable = mDataActivity.getDrawable();
- if (dataActivityDrawable instanceof Animatable) {
- Animatable ad = (Animatable) dataActivityDrawable;
- if (!ad.isRunning()) {
- ad.start();
- }
- }
-
- mMobileActivity.setImageResource(mMobileActivityId);
- Drawable mobileActivityDrawable = mMobileActivity.getDrawable();
- if (mobileActivityDrawable instanceof Animatable) {
- Animatable ad = (Animatable) mobileActivityDrawable;
- if (!ad.isRunning()) {
- ad.start();
- }
- }
-
- if (mStackedDataId != 0 && mStackedVoiceId != 0) {
- mStackedData.setImageResource(mStackedDataId);
- mStackedVoice.setImageResource(mStackedVoiceId);
- mMobileSingleGroup.setVisibility(View.GONE);
- mMobileStackedGroup.setVisibility(View.VISIBLE);
- } else {
- mStackedData.setImageResource(0);
- mStackedVoice.setImageResource(0);
- mMobileSingleGroup.setVisibility(View.VISIBLE);
- mMobileStackedGroup.setVisibility(View.GONE);
- }
-
mMobileGroup.setContentDescription(mMobileTypeDescription
+ " " + mMobileDescription);
mMobileGroup.setVisibility(View.VISIBLE);
@@ -644,8 +536,6 @@ public class SignalClusterView
(mMobileVisible ? "VISIBLE" : "GONE"), mMobileStrengthId, mMobileTypeId));
mMobileType.setVisibility(mMobileTypeId != 0 ? View.VISIBLE : View.GONE);
- mDataActivity.setVisibility(mDataActivityId != 0 ? View.VISIBLE : View.GONE);
- mMobileActivity.setVisibility(mMobileActivityId != 0 ? View.VISIBLE : View.GONE);
return mMobileVisible;
}
generated by cgit v1.1 at 2025-02-04 06:55:10 +0000