From b9dd0585817403120dd848171dba2f30767a1053 Mon Sep 17 00:00:00 2001
From: Gopal G Goberu <ggober@codeaurora.org>
Date: Mon, 3 Aug 2015 11:11:03 +0200
Subject: Revert "SnapdragonCamera: Reduce number of countdown timer option"

This reverts commit 57d77499b09d207187c8a1051bf043ba9fb43c84.

Change-Id: I91faf90357f5563e594756c0b7a942c34bbee344
---
 src/com/android/camera/CountDownTimerPreference.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/camera/CountDownTimerPreference.java b/src/com/android/camera/CountDownTimerPreference.java
index 57820ac76..3d5f3a4c7 100644
--- a/src/com/android/camera/CountDownTimerPreference.java
+++ b/src/com/android/camera/CountDownTimerPreference.java
@@ -23,7 +23,7 @@ import org.codeaurora.snapcam.R;
 
 public class CountDownTimerPreference extends IconListPreference {
     private static final int[] DURATIONS = {
-        0, 2, 5, 10
+        0, 1, 2, 3, 4, 5, 10, 15, 20, 30, 60
     };
     public CountDownTimerPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -39,7 +39,7 @@ public class CountDownTimerPreference extends IconListPreference {
                 entries[0] = context.getString(R.string.setting_off); // Off
             } else {
                 entries[i] = context.getResources()
-                        .getQuantityString(R.plurals.pref_camera_timer_entry, DURATIONS[i],
+                        .getQuantityString(R.plurals.pref_camera_timer_entry, i,
                         DURATIONS[i]);
             }
         }
-- 
cgit v1.2.3