diff options
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/NetworkModeButton.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/NetworkModeButton.java | 68 |
1 files changed, 30 insertions, 38 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/NetworkModeButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/NetworkModeButton.java index 8aa5e5c..53a4e79 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/NetworkModeButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/NetworkModeButton.java @@ -36,16 +36,16 @@ public class NetworkModeButton extends PowerButton{ private static final int CM_MODE_3GONLY = 1; private static final int CM_MODE_BOTH = 2; - private static int NETWORK_MODE = NO_NETWORK_MODE_YET; - private static int INTENDED_NETWORK_MODE = NO_NETWORK_MODE_YET; - private static int CURRENT_INTERNAL_STATE = STATE_INTERMEDIATE; + private int mMode = NO_NETWORK_MODE_YET; + private int mIntendedMode = NO_NETWORK_MODE_YET; + private int mInternalState = STATE_INTERMEDIATE; public NetworkModeButton() { mType = BUTTON_NETWORKMODE; } @Override protected void updateState() { Context context = mView.getContext(); - NETWORK_MODE = get2G3G(context); + mMode = get2G3G(context); mState = networkModeToState(context); switch (mState) { @@ -53,7 +53,7 @@ public class NetworkModeButton extends PowerButton{ mIcon = R.drawable.stat_2g3g_off; break; case STATE_ENABLED: - if (NETWORK_MODE == Phone.NT_MODE_WCDMA_ONLY) { + if (mMode == Phone.NT_MODE_WCDMA_ONLY) { mIcon = R.drawable.stat_3g_on; } else { mIcon = R.drawable.stat_2g3g_on; @@ -65,8 +65,8 @@ public class NetworkModeButton extends PowerButton{ // the top dark-gray-or-bright-white logo shows the // user's intent. This is much easier to see in // sunlight. - if (CURRENT_INTERNAL_STATE == STATE_TURNING_ON) { - if (INTENDED_NETWORK_MODE == Phone.NT_MODE_WCDMA_ONLY) { + if (mInternalState == STATE_TURNING_ON) { + if (mIntendedMode == Phone.NT_MODE_WCDMA_ONLY) { mIcon = R.drawable.stat_3g_on; } else { mIcon = R.drawable.stat_2g3g_on; @@ -84,38 +84,38 @@ public class NetworkModeButton extends PowerButton{ int currentMode = getCurrentCMMode(context); Intent intent = new Intent(ACTION_MODIFY_NETWORK_MODE); - switch (NETWORK_MODE) { + switch (mMode) { case Phone.NT_MODE_WCDMA_PREF: case Phone.NT_MODE_GSM_UMTS: intent.putExtra(EXTRA_NETWORK_MODE, Phone.NT_MODE_GSM_ONLY); - CURRENT_INTERNAL_STATE = STATE_TURNING_OFF; - INTENDED_NETWORK_MODE=Phone.NT_MODE_GSM_ONLY; + mInternalState = STATE_TURNING_OFF; + mIntendedMode = Phone.NT_MODE_GSM_ONLY; break; case Phone.NT_MODE_WCDMA_ONLY: - if(currentMode == CM_MODE_3GONLY) { + if (currentMode == CM_MODE_3GONLY) { intent.putExtra(EXTRA_NETWORK_MODE, Phone.NT_MODE_GSM_ONLY); - CURRENT_INTERNAL_STATE = STATE_TURNING_OFF; - INTENDED_NETWORK_MODE = Phone.NT_MODE_GSM_ONLY; + mInternalState = STATE_TURNING_OFF; + mIntendedMode = Phone.NT_MODE_GSM_ONLY; } else { intent.putExtra(EXTRA_NETWORK_MODE, Phone.NT_MODE_WCDMA_PREF); - CURRENT_INTERNAL_STATE = STATE_TURNING_ON; - INTENDED_NETWORK_MODE = Phone.NT_MODE_WCDMA_PREF; + mInternalState = STATE_TURNING_ON; + mIntendedMode = Phone.NT_MODE_WCDMA_PREF; } break; case Phone.NT_MODE_GSM_ONLY: - if(currentMode == CM_MODE_3GONLY || currentMode == CM_MODE_BOTH) { + if (currentMode == CM_MODE_3GONLY || currentMode == CM_MODE_BOTH) { intent.putExtra(EXTRA_NETWORK_MODE, Phone.NT_MODE_WCDMA_ONLY); - CURRENT_INTERNAL_STATE = STATE_TURNING_ON; - INTENDED_NETWORK_MODE = Phone.NT_MODE_WCDMA_ONLY; + mInternalState = STATE_TURNING_ON; + mIntendedMode = Phone.NT_MODE_WCDMA_ONLY; } else { intent.putExtra(EXTRA_NETWORK_MODE, Phone.NT_MODE_WCDMA_PREF); - CURRENT_INTERNAL_STATE = STATE_TURNING_ON; - INTENDED_NETWORK_MODE = Phone.NT_MODE_WCDMA_PREF; + mInternalState = STATE_TURNING_ON; + mIntendedMode = Phone.NT_MODE_WCDMA_PREF; } break; } - NETWORK_MODE = NETWORK_MODE_UNKNOWN; + mMode = NETWORK_MODE_UNKNOWN; context.sendBroadcast(intent); } @@ -133,22 +133,14 @@ public class NetworkModeButton extends PowerButton{ @Override public void onReceive(Context context, Intent intent) { if (intent.getExtras() != null) { - NETWORK_MODE = intent.getExtras().getInt(EXTRA_NETWORK_MODE); + mMode = intent.getExtras().getInt(EXTRA_NETWORK_MODE); //Update to actual state - INTENDED_NETWORK_MODE = NETWORK_MODE; + mIntendedMode = mMode; } //need to clear intermediate states - CURRENT_INTERNAL_STATE = STATE_ENABLED; - - int widgetState = networkModeToState(context); - CURRENT_INTERNAL_STATE = widgetState; - if (widgetState == STATE_ENABLED) { - MobileDataButton mdb = (MobileDataButton)getLoadedButton(BUTTON_MOBILEDATA); - if(mdb != null) { - mdb.networkModeChanged(context, NETWORK_MODE); - } - } + mInternalState = STATE_ENABLED; + mInternalState = networkModeToState(context); } @Override @@ -173,12 +165,12 @@ public class NetworkModeButton extends PowerButton{ return state; } - private static int networkModeToState(Context context) { - if (CURRENT_INTERNAL_STATE == STATE_TURNING_ON || - CURRENT_INTERNAL_STATE == STATE_TURNING_OFF) + private int networkModeToState(Context context) { + if (mInternalState == STATE_TURNING_ON || mInternalState == STATE_TURNING_OFF) { return STATE_INTERMEDIATE; + } - switch(NETWORK_MODE) { + switch (mMode) { case Phone.NT_MODE_WCDMA_PREF: case Phone.NT_MODE_WCDMA_ONLY: case Phone.NT_MODE_GSM_UMTS: @@ -190,7 +182,7 @@ public class NetworkModeButton extends PowerButton{ case Phone.NT_MODE_EVDO_NO_CDMA: case Phone.NT_MODE_GLOBAL: // need to check wtf is going on - Log.d(TAG, "Unexpected network mode (" + NETWORK_MODE + ")"); + Log.d(TAG, "Unexpected network mode (" + mMode + ")"); return STATE_DISABLED; } return STATE_INTERMEDIATE; |