summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGopal G Goberu <ggober@codeaurora.org>2015-08-03 11:11:03 +0200
committerChippa-a <vusal1372@gmail.com>2019-10-25 15:55:25 +0300
commitb9dd0585817403120dd848171dba2f30767a1053 (patch)
tree84d50ff76a10c265201ebdc7814b2c47cb89846f
parenta8690acd749ef28d6cbd1f0499c52bebdcc307b0 (diff)
downloadandroid_packages_apps_Snap-b9dd0585817403120dd848171dba2f30767a1053.tar.gz
android_packages_apps_Snap-b9dd0585817403120dd848171dba2f30767a1053.tar.bz2
android_packages_apps_Snap-b9dd0585817403120dd848171dba2f30767a1053.zip
Revert "SnapdragonCamera: Reduce number of countdown timer option"
This reverts commit 57d77499b09d207187c8a1051bf043ba9fb43c84. Change-Id: I91faf90357f5563e594756c0b7a942c34bbee344
-rw-r--r--src/com/android/camera/CountDownTimerPreference.java4
1 files 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]);
}
}