From 1874e960c141d16bebd65174baf11923b0ab053d Mon Sep 17 00:00:00 2001
From: Suman Mukherjee <sumam@codeaurora.org>
Date: Thu, 27 Mar 2014 13:08:38 +0530
Subject: Camera: Block DIS and Timelapse for HFR

DIS and Timelapse is not supported for HFR scenario.
If user'll start recording with timelapse or DIS with HFR
then crash observed from lower layer.

Fix Made: User'll be notified that HFR/HSR selection is not allowed
for TimeLapse and/ DIS mode. After that, HFR selection will be set to
off and the option will be disabled. It'll not be vice versa as
DIS/TimeLapse has higher priority than HFR for their existance in
primary popup rather than being in secondary.

Change-Id: I42ed3d3d20727ddda1b15c21b3ba85c8c41a82ef
CRs-Fixed: 627373, 627362
---
 res/values/qcomstrings.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'res/values')

diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index a5a51a13e..50ee79c23 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -194,6 +194,9 @@
      <!-- Default mce setting. Do not translate. -->
      <string name="pref_camera_mce_default">enable</string>
 
+     <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
+     <string name="error_app_unsupported_hfr_selection">HFR/HSR is not supported for DIS and/ TimeLapse</string>
+
      <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
      <string name="error_app_unsupported_hfr">HFR is not supported for selected resolution</string>
 
-- 
cgit v1.2.3