Camera: Fix the countdown timer values updated on UI.

The count down timer values shown on the UI are not reflecting
the values actually selected.
For eg: If user selects 6 seconds, the value selected is 10 seconds.
This is because the code populating the UI is not picking up the
expected duration value. Fix this by showing the correct duration
value on the UI.

(cherry picked from commit 2856dcfb239a33c8f9d2051b3549190c17a666d9 )

Change-Id: I6a3fed525b373ce3d415b95dc7a4b6336210bd15
(cherry picked from commit d08a0c0f4a06d6f700a019a0ecd77b918015c798)
(cherry picked from commit 4d582e49339beb9502b381c129f0942be0e044ea)
(cherry picked from commit a6855eae463be00da29532c35334bdc3b163f77d)

1 files changed, 2 insertions, 1 deletions

diff --git a/src/com/android/camera/CountDownTimerPreference.java b/src/com/android/camera/CountDownTimerPreference.java
index 9a7e44bfb..14819fa48 100644
--- a/src/com/android/camera/CountDownTimerPreference.java
+++ b/src/com/android/camera/CountDownTimerPreference.java
@@ -39,7 +39,8 @@ public class CountDownTimerPreference extends ListPreference {
                 entries[0] = context.getString(R.string.setting_off); // Off
             } else {
                 entries[i] = context.getResources()
-                        .getQuantityString(R.plurals.pref_camera_timer_entry, i, i);
+                        .getQuantityString(R.plurals.pref_camera_timer_entry, i,
+                        DURATIONS[i]);
             }
         }
         setEntries(entries);