diff options
| author | d34d <clark@cyngn.com> | 2015-09-04 14:24:09 -0700 |
|---|---|---|
| committer | d34d <clark@cyngn.com> | 2015-09-04 14:26:25 -0700 |
| commit | d4098cfbec159ae5824cb3a06263526ba1ebdf61 (patch) | |
| tree | 77d5dcdf8ebd5e008fb56085710fe7566da584cd /src/com | |
| parent | 439e7faf710459d1ed8989185b2329cde78f4157 (diff) | |
| download | packages_apps_ThemeChooser-d4098cfbec159ae5824cb3a06263526ba1ebdf61.tar.gz packages_apps_ThemeChooser-d4098cfbec159ae5824cb3a06263526ba1ebdf61.tar.bz2 packages_apps_ThemeChooser-d4098cfbec159ae5824cb3a06263526ba1ebdf61.zip | |
Avoid IllegalStateException in loadStatusBar()
Check if wifiMarginIdx and clockColorIdx are valid indices and if
not use some default values.
Change-Id: I97bfc9ab4145d2aaeb155fa4ef77b0312e7431bc
REF: CYNGNOS-845
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/cyngn/theme/chooser/ThemeFragment.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/cyngn/theme/chooser/ThemeFragment.java b/src/com/cyngn/theme/chooser/ThemeFragment.java index 77daf1d..bd57798 100644 --- a/src/com/cyngn/theme/chooser/ThemeFragment.java +++ b/src/com/cyngn/theme/chooser/ThemeFragment.java @@ -24,6 +24,7 @@ import android.content.res.ThemeManager; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; +import android.graphics.Color; import android.graphics.Point; import android.graphics.Rect; import android.graphics.Typeface; @@ -166,6 +167,9 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb private static final int ADDITIONAL_CONTENT_SPACE_ID = 123456; private static final long SLIDE_CONTENT_ANIM_DURATION = 300L; + private static final int DEFAULT_WIFI_MARGIN = 0; + private static final int DEFAULT_CLOCK_COLOR = Color.WHITE; + protected static final String WALLPAPER_NONE = ""; protected static final String ARG_PACKAGE_NAME = "pkgName"; @@ -1480,8 +1484,8 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb Bitmap wifiIcon = Utils.loadBitmapBlob(c, wifiIdx); Bitmap signalIcon = Utils.loadBitmapBlob(c, signalIdx); Bitmap batteryIcon = Utils.loadBitmapBlob(c, batteryIdx); - int wifiMargin = c.getInt(wifiMarginIdx); - int clockTextColor = c.getInt(clockColorIdx); + int wifiMargin = wifiMarginIdx != -1 ? c.getInt(wifiMarginIdx) : DEFAULT_WIFI_MARGIN; + int clockTextColor = clockColorIdx != -1 ? c.getInt(clockColorIdx) : DEFAULT_CLOCK_COLOR; Drawable overlay = null; if (animate) { |