Removing track_color_mode_none.

The default value for track_color_mode_options is
@string/none, not @string/track_color_mode_none.
See preferences.xml
This commit is contained in:
Jimmy Shih
2011-10-25 17:11:34 -07:00
parent c799f8d716
commit e7c0f3b5d0
5 changed files with 3 additions and 5 deletions
-1
View File
@@ -522,7 +522,6 @@ limitations under the License.
<string name="zephyr_bt_sensor_option">Bluetooth Zephyr</string>
<!-- Track Color Modes -->
<string name="track_color_mode_none">Ninguno</string>
<string name="track_color_mode_fixed">Fijo (BETA)</string>
<string name="track_color_mode_dynamic">Dinámico (BETA)</string>
</resources>
@@ -120,7 +120,7 @@ limitations under the License.
</string-array>
<string-array name="track_color_mode_options">
<item>@string/track_color_mode_none</item>
<item>@string/none</item>
<item>@string/track_color_mode_fixed</item>
<item>@string/track_color_mode_dynamic</item>
</string-array>
-1
View File
@@ -584,7 +584,6 @@ limitations under the License.
<string name="zephyr_bt_sensor_option">Zephyr Bluetooth</string>
<!-- Track Color Modes -->
<string name="track_color_mode_none">None</string>
<string name="track_color_mode_fixed">Fixed (BETA)</string>
<string name="track_color_mode_dynamic">Dynamic (BETA)</string>
</resources>
@@ -49,7 +49,7 @@ public class TrackPathPainterFactory {
String colorMode = prefs.getString(context.getString(R.string.track_color_mode_key), null);
Log.i(TAG, "Creating track path painter of type: " + colorMode);
if (colorMode == null || colorMode.equals(context.getString(R.string.track_color_mode_none))) {
if (colorMode == null || colorMode.equals(context.getString(R.string.none))) {
return new SingleColorTrackPathPainter(context);
} else if (colorMode.equals(context.getString(R.string.track_color_mode_fixed))) {
return new DynamicSpeedTrackPathPainter(context,
@@ -46,7 +46,7 @@ public class TrackPathPainterFactoryTest extends TrackPathPainterTestCase {
return;
}
testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_none,
testTrackPathPainterFactorySpecific(context, prefs, R.string.none,
SingleColorTrackPathPainter.class);
testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_fixed,
DynamicSpeedTrackPathPainter.class);