#61 Fixed type conversion problem.

Author: mpost

app/com.plusonelabs.calendar/res/xml/preferences_appearance.xml

@@ -4,7 +4,7 @@
         android:defaultValue="1.0"
         android:entries="@array/pref_text_size_entries"
         android:entryValues="@array/pref_text_size_values"
-        android:key="textSize"
+        android:key="textSizeScale"
         android:summary="@string/appearance_text_size_desc"
         android:title="@string/appearance_text_size_title" />
 

app/com.plusonelabs.calendar/src/com/plusonelabs/calendar/RemoteViewsUtil.java

@@ -48,15 +48,17 @@ public static void setHeight(Context context, RemoteViews rv, int viewId, int di
 	private static float getScaledValueInPixel(Context context, int dimenId) {
 		float resValue = getResourceValue(context, dimenId);
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-		float prefTextScale = parseFloat(prefs.getString(PREF_TEXT_SIZE, PREF_TEXT_SIZE_DEFAULT));
+		float prefTextScale = parseFloat(prefs.getString(PREF_TEXT_SIZE_SCALE,
+				PREF_TEXT_SIZE_SCALE_DEFAULT));
 		return resValue * prefTextScale;
 	}
 
 	private static float getScaledValue(Context context, int dimenId) {
 		float resValue = getResourceValue(context, dimenId);
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
 		float density = context.getResources().getDisplayMetrics().density;
-		float prefTextScale = parseFloat(prefs.getString(PREF_TEXT_SIZE, PREF_TEXT_SIZE_DEFAULT));
+		float prefTextScale = parseFloat(prefs.getString(PREF_TEXT_SIZE_SCALE,
+				PREF_TEXT_SIZE_SCALE_DEFAULT));
 		return resValue * prefTextScale / density;
 	}
 

app/com.plusonelabs.calendar/src/com/plusonelabs/calendar/prefs/CalendarPreferences.java

@@ -2,8 +2,8 @@
 
 public class CalendarPreferences {
 
-	public static final String PREF_TEXT_SIZE = "textSize";
-	public static final String PREF_TEXT_SIZE_DEFAULT = "1.0";
+	public static final String PREF_TEXT_SIZE_SCALE = "textSizeScale";
+	public static final String PREF_TEXT_SIZE_SCALE_DEFAULT = "1.0";
 	public static final String PREF_MULTILINE_TITLE = "multiline_title";
 	public static final boolean PREF_MULTILINE_TITLE_DEFAULT = false;
 	public static final String PREF_ACTIVE_CALENDARS = "activeCalendars";