From 24d5d3208a5d808722d63381f005fcd1388a2199 Mon Sep 17 00:00:00 2001 From: Sander Bogaert Date: Fri, 24 Aug 2012 12:39:23 -0400 Subject: [PATCH] Use SupportProgressBar methods. --- src/com/fsck/k9/activity/ChooseFolder.java | 5 +++-- src/com/fsck/k9/activity/MessageCompose.java | 17 ++++++++++++++--- src/com/fsck/k9/activity/MessageView.java | 8 ++++---- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/com/fsck/k9/activity/ChooseFolder.java b/src/com/fsck/k9/activity/ChooseFolder.java index a7ba8f7cc..1ac7ca9ae 100644 --- a/src/com/fsck/k9/activity/ChooseFolder.java +++ b/src/com/fsck/k9/activity/ChooseFolder.java @@ -16,8 +16,9 @@ import android.text.TextWatcher; import android.util.Log; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; +import com.actionbarsherlock.view.Window; + import android.view.View; -import android.view.Window; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.EditText; @@ -142,7 +143,7 @@ public class ChooseFolder extends K9ListActivity { public void handleMessage(android.os.Message msg) { switch (msg.what) { case MSG_PROGRESS: { - setProgressBarIndeterminateVisibility(msg.arg1 != 0); + setSupportProgressBarIndeterminateVisibility(msg.arg1 != 0); break; } case MSG_SET_SELECTED_FOLDER: { diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index ed18b3c38..c0aa2f433 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -24,11 +24,12 @@ import android.util.TypedValue; import android.view.LayoutInflater; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; +import com.actionbarsherlock.view.Window; + import android.view.View; import android.view.View.OnClickListener; import android.view.View.OnFocusChangeListener; import android.view.ViewGroup; -import android.view.Window; import android.webkit.WebView; import android.webkit.WebViewClient; import android.widget.AutoCompleteTextView.Validator; @@ -323,10 +324,10 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc public void handleMessage(android.os.Message msg) { switch (msg.what) { case MSG_PROGRESS_ON: - setProgressBarIndeterminateVisibility(true); + setSupportProgressBarIndeterminateVisibility(true); break; case MSG_PROGRESS_OFF: - setProgressBarIndeterminateVisibility(false); + setSupportProgressBarIndeterminateVisibility(false); break; case MSG_UPDATE_TITLE: updateTitle(); @@ -449,6 +450,16 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc context.startActivity(i); } + /* + * This is a workaround for an annoying ( temporarly? ) issue: + * https://github.com/JakeWharton/ActionBarSherlock/issues/449 + */ + @Override + protected void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + setSupportProgressBarIndeterminateVisibility(false); + } + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index ecd049b89..9509c9904 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -259,7 +259,7 @@ public class MessageView extends K9Activity implements OnClickListener { public void progress(final boolean progress) { runOnUiThread(new Runnable() { public void run() { - setProgressBarIndeterminateVisibility(progress); + setSupportProgressBarIndeterminateVisibility(progress); } }); } @@ -972,7 +972,7 @@ public class MessageView extends K9Activity implements OnClickListener { } mHandler.post(new Runnable() { public void run() { - setProgressBarIndeterminateVisibility(false); + setSupportProgressBarIndeterminateVisibility(false); if (t instanceof IllegalArgumentException) { mHandler.invalidIdError(); } else { @@ -994,7 +994,7 @@ public class MessageView extends K9Activity implements OnClickListener { } mHandler.post(new Runnable() { public void run() { - setProgressBarIndeterminateVisibility(false); + setSupportProgressBarIndeterminateVisibility(false); mMessageView.setShowDownloadButton(message); } }); @@ -1008,7 +1008,7 @@ public class MessageView extends K9Activity implements OnClickListener { } mHandler.post(new Runnable() { public void run() { - setProgressBarIndeterminateVisibility(true); + setSupportProgressBarIndeterminateVisibility(true); } }); }