am 50c1e5de: Merge "Update view on UI thread" into jb-mr1-dev

* commit '50c1e5dee8e45edf8f7593c722399735659127e7':
  Update view on UI thread
This commit is contained in:
Irfan Sheriff
2012-08-22 12:17:13 -07:00
committed by Android Git Automerger

View File

@@ -201,31 +201,36 @@ public class WpsDialog extends AlertDialog {
} }
} }
private void updateDialog(DialogState state, String msg) { private void updateDialog(final DialogState state, final String msg) {
if (mDialogState.ordinal() >= state.ordinal()) { if (mDialogState.ordinal() >= state.ordinal()) {
//ignore. //ignore.
return; return;
} }
mDialogState = state; mDialogState = state;
switch(state) { mHandler.post(new Runnable() {
case WPS_COMPLETE: @Override
mTimeoutBar.setVisibility(View.GONE); public void run() {
mProgressBar.setVisibility(View.VISIBLE); switch(state) {
break; case WPS_COMPLETE:
case CONNECTED: mTimeoutBar.setVisibility(View.GONE);
case WPS_FAILED: mProgressBar.setVisibility(View.VISIBLE);
mButton.setText(mContext.getString(R.string.dlg_ok)); break;
mTimeoutBar.setVisibility(View.GONE); case CONNECTED:
mProgressBar.setVisibility(View.GONE); case WPS_FAILED:
if (mReceiver != null) { mButton.setText(mContext.getString(R.string.dlg_ok));
mContext.unregisterReceiver(mReceiver); mTimeoutBar.setVisibility(View.GONE);
mReceiver = null; mProgressBar.setVisibility(View.GONE);
if (mReceiver != null) {
mContext.unregisterReceiver(mReceiver);
mReceiver = null;
}
break;
}
mTextView.setText(msg);
} }
break; });
} }
mTextView.setText(msg);
}
private void handleEvent(Context context, Intent intent) { private void handleEvent(Context context, Intent intent) {
String action = intent.getAction(); String action = intent.getAction();