From 04eecd31474ca2ba74b3f0ed3bd6316c20eb8d12 Mon Sep 17 00:00:00 2001 From: James Sanford Date: Fri, 26 Jul 2013 18:01:19 -0700 Subject: [PATCH] Bugfix: Avoid setProgressNumberFormat on Honeycomb. --- src/com/froop/app/kegs/KegsMain.java | 7 +++++-- src/com/froop/app/kegs/SpecialProgressDialog.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/com/froop/app/kegs/KegsMain.java b/src/com/froop/app/kegs/KegsMain.java index 64cced7..f246d98 100644 --- a/src/com/froop/app/kegs/KegsMain.java +++ b/src/com/froop/app/kegs/KegsMain.java @@ -323,8 +323,11 @@ public class KegsMain extends SherlockFragmentActivity implements KegsKeyboard.S // TODO: should probably use an XML layout for this. dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); dialog.setMessage(getResources().getText(R.string.rom_check)); - dialog.setProgressNumberFormat(null); - if (android.os.Build.VERSION.SDK_INT >= 11) { + if (android.os.Build.VERSION.SDK_INT <= 10 || android.os.Build.VERSION.SDK_INT >= 14) { + // This seems to crash on some vendors Honeycomb. + dialog.setProgressNumberFormat(null); + } + if (android.os.Build.VERSION.SDK_INT >= 14) { dialog.setProgressPercentFormat(null); } dialog.setIndeterminate(true); diff --git a/src/com/froop/app/kegs/SpecialProgressDialog.java b/src/com/froop/app/kegs/SpecialProgressDialog.java index da1bcf5..8f58f89 100644 --- a/src/com/froop/app/kegs/SpecialProgressDialog.java +++ b/src/com/froop/app/kegs/SpecialProgressDialog.java @@ -24,8 +24,11 @@ public class SpecialProgressDialog extends SherlockDialogFragment { // TODO: should probably use an XML layout for this. dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); dialog.setMessage(getResources().getText(R.string.progress_message)); - dialog.setProgressNumberFormat(null); - if (android.os.Build.VERSION.SDK_INT >= 11) { + if (android.os.Build.VERSION.SDK_INT <= 10 || android.os.Build.VERSION.SDK_INT >= 14) { + // This seems to crash on some vendors Honeycomb. + dialog.setProgressNumberFormat(null); + } + if (android.os.Build.VERSION.SDK_INT >= 14) { dialog.setProgressPercentFormat(null); } dialog.setIndeterminate(true);