summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2015-03-12 16:06:25 -0700
committerEd Carrigan <cretin45@gmail.com>2015-03-12 23:18:48 +0000
commite466140205d15df27bdcf0a7ae3146d97d3b8d62 (patch)
tree1a63b90f36e93b30d9d539bcfcfe3865e0ce4fd1
parentf968e24a5d00f11fc2c6d9bf6ccf1ab83b93683a (diff)
downloadandroid_packages_apps_Dialer-e466140205d15df27bdcf0a7ae3146d97d3b8d62.tar.gz
android_packages_apps_Dialer-e466140205d15df27bdcf0a7ae3146d97d3b8d62.tar.bz2
android_packages_apps_Dialer-e466140205d15df27bdcf0a7ae3146d97d3b8d62.zip
Dialer: Add call waiting vibrate option
Change-Id: Id903310aa0ef74fe01349e39262159e4795f4501 (cherry picked from commit 475a7e9cdefec248fe153ebd8afe8dfd6c90b29d)
-rw-r--r--res/values/cm_strings.xml1
-rw-r--r--res/xml/general_settings.xml4
2 files changed, 5 insertions, 0 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 237b51532..2ef85bb36 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -101,6 +101,7 @@
<string name="incall_vibration_category_title">In-call vibration</string>
<string name="incall_vibrate_outgoing_title">Vibrate on answer</string>
+ <string name="vibrate_call_waiting">Vibrate on call waiting</string>
<string name="incall_vibrate_hangup_title">Vibrate on hang up</string>
<string name="incall_vibrate_45_title">Vibrate every minute</string>
<string name="incall_vibrate_45_summary">Vibrates at the 45 second mark of every minute during outgoing calls</string>
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
index 9b1b5d126..1d70b9ac7 100644
--- a/res/xml/general_settings.xml
+++ b/res/xml/general_settings.xml
@@ -70,6 +70,10 @@
android:title="@string/incall_vibrate_outgoing_title" />
<CheckBoxPreference
+ android:key="incall_vibrate_call_waiting"
+ android:title="@string/vibrate_call_waiting"/>
+
+ <CheckBoxPreference
android:key="incall_vibrate_hangup"
android:title="@string/incall_vibrate_hangup_title" />