Simplify the code. Change references of "@strings" to literals for those
non-translatable values.
Change-Id: I56636cd8f5674937ee6e3fb4023959199fcf4bb0
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 0b7c9e0..6d25637 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -75,8 +75,8 @@
</string-array>
<string-array name="pref_camera_focusmode_entryvalues" translatable="false">
- <item>@string/pref_camera_focusmode_value_auto</item>
- <item>@string/pref_camera_focusmode_value_infinity</item>
+ <item>auto</item>
+ <item>infinity</item>
</string-array>
<!-- Camera Preferences flash mode dialog box entries -->
@@ -87,9 +87,9 @@
</string-array>
<string-array name="pref_camera_flashmode_entryvalues" translatable="false">
- <item>@string/pref_camera_flashmode_value_auto</item>
- <item>@string/pref_camera_flashmode_value_on</item>
- <item>@string/pref_camera_flashmode_value_off</item>
+ <item>auto</item>
+ <item>on</item>
+ <item>off</item>
</string-array>
<!-- Camera Preferences White Balance dialog box entries -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7ba4664..96ae1aa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -395,10 +395,6 @@
<string name="pref_camera_focusmode_entry_auto">Auto</string>
<string name="pref_camera_focusmode_entry_infinity">Infinity</string>
- <!-- Focus mode entry values.-->
- <string name="pref_camera_focusmode_value_auto" translatable="false">auto</string>
- <string name="pref_camera_focusmode_value_infinity" translatable="false">infinity</string>
-
<!-- Settings screen, focus mode dialog title -->
<string name="pref_camera_focusmode_dialogtitle">Focus mode</string>
@@ -413,11 +409,6 @@
<string name="pref_camera_flashmode_entry_on">On</string>
<string name="pref_camera_flashmode_entry_off">Off</string>
- <!-- Flash mode entry values.-->
- <string name="pref_camera_flashmode_value_auto" translatable="false">auto</string>
- <string name="pref_camera_flashmode_value_on" translatable="false">on</string>
- <string name="pref_camera_flashmode_value_off" translatable="false">off</string>
-
<!-- Settings screen, flash mode dialog title -->
<string name="pref_camera_flashmode_dialogtitle">Flash mode</string>
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 60a2469..ead381b 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1382,8 +1382,7 @@
// If the user has half-pressed the shutter and focus is completed, we
// can take the photo right away. If the focus mode is infinity, we can
// also take the photo.
- if (mFocusMode.equals(getString(
- R.string.pref_camera_focusmode_value_infinity))
+ if (mFocusMode.equals(CameraSettings.VALUE_FOCUS_INFINITY)
|| (mFocusState == FOCUS_SUCCESS
|| mFocusState == FOCUS_FAIL)) {
if (mZoomButtons != null) mZoomButtons.setVisible(false);
@@ -1400,8 +1399,7 @@
private void doFocus(boolean pressed) {
// Do the focus if the mode is auto. No focus needed in infinity mode.
- if (mFocusMode.equals(getString(
- R.string.pref_camera_focusmode_value_auto))) {
+ if (mFocusMode.equals(CameraSettings.VALUE_FOCUS_AUTO)) {
if (pressed) { // Focus key down.
autoFocus();
} else { // Focus key up.
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 1888e32..d26a801 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -34,6 +34,10 @@
public static final String KEY_WHITE_BALANCE =
"pref_camera_whitebalance_key";
public static final String KEY_SCENE_MODE = "pref_camera_scenemode_key";
+
+ public static final String VALUE_FOCUS_INFINITY = "infinity";
+ public static final String VALUE_FOCUS_AUTO = "auto";
+
public static final int CURRENT_VERSION = 1;
// max mms video duration in seconds.