From 7e827acae69298441b970262a309a957c92da155 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Thu, 3 Dec 2009 11:44:30 -0500 Subject: [PATCH] =?utf8?q?Show=20a=20long=20dash=20instead=20of=200=C2=B0?= =?utf8?q?=20if=20no=20temperature=20is=20available.=20(DO=20NOT=20MERGE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes http://b/2301604 --- src/com/android/deskclock/DeskClock.java | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java index 3cfcc38..88030cd 100644 --- a/src/com/android/deskclock/DeskClock.java +++ b/src/com/android/deskclock/DeskClock.java @@ -389,21 +389,35 @@ public class DeskClock extends Activity { mWeatherIconDrawable = mGenieResources.getDrawable(cur.getInt( cur.getColumnIndexOrThrow("iconResId"))); - mWeatherCurrentTemperatureString = String.format("%d\u00b0", - (cur.getInt(cur.getColumnIndexOrThrow("temperature")))); - mWeatherHighTemperatureString = String.format("%d\u00b0", - (cur.getInt(cur.getColumnIndexOrThrow("highTemperature")))); - mWeatherLowTemperatureString = String.format("%d\u00b0", - (cur.getInt(cur.getColumnIndexOrThrow("lowTemperature")))); + mWeatherLocationString = cur.getString( cur.getColumnIndexOrThrow("location")); + + // any of these may be NULL + final int colTemp = cur.getColumnIndexOrThrow("temperature"); + final int colHigh = cur.getColumnIndexOrThrow("highTemperature"); + final int colLow = cur.getColumnIndexOrThrow("lowTemperature"); + + mWeatherCurrentTemperatureString = + cur.isNull(colTemp) + ? "\u2014" + : String.format("%d\u00b0", cur.getInt(colTemp)); + mWeatherHighTemperatureString = + cur.isNull(colHigh) + ? "\u2014" + : String.format("%d\u00b0", cur.getInt(colHigh)); + mWeatherLowTemperatureString = + cur.isNull(colLow) + ? "\u2014" + : String.format("%d\u00b0", cur.getInt(colLow)); } else { Log.w(LOG_TAG, "No weather information available (cur=" + cur +")"); mWeatherIconDrawable = null; - mWeatherHighTemperatureString = ""; - mWeatherLowTemperatureString = ""; mWeatherLocationString = getString(R.string.weather_fetch_failure); + mWeatherCurrentTemperatureString = + mWeatherHighTemperatureString = + mWeatherLowTemperatureString = ""; } mHandy.sendEmptyMessage(UPDATE_WEATHER_DISPLAY_MSG); -- 2.11.0