summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlinuxxxxx <joey@cyanogenmoditalia.it>2015-04-21 20:43:01 +0200
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-06-02 20:31:28 +0000
commit22335cd4cdfdba31bdf58650b1e93a0474584711 (patch)
tree64eefae3faa9344dde4b5440861853cc881cf267
parentc9b91d0c87f8149fe6874214d8273be1b1247e2c (diff)
downloadandroid_packages_apps_Dialer-22335cd4cdfdba31bdf58650b1e93a0474584711.tar.gz
android_packages_apps_Dialer-22335cd4cdfdba31bdf58650b1e93a0474584711.tar.bz2
android_packages_apps_Dialer-22335cd4cdfdba31bdf58650b1e93a0474584711.zip
[2/2] Dialer: SmartMute
Mute the incoming call by flipping the phone Change-Id: I2009bc7b4d0d1b23f76b232e156ea0fa35e3ad5b Signed-off-by: linuxxxxx <joey@cyanogenmoditalia.it>
-rw-r--r--res/values/cm_strings.xml5
-rw-r--r--res/xml/general_settings.xml25
-rw-r--r--src/com/android/dialer/settings/GeneralSettingsFragment.java1
3 files changed, 24 insertions, 7 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 5cd8351a2..7361e190a 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -126,7 +126,10 @@
<string name="stop_call_playback">Stop</string>
<string name="call_playback_error_message">Failed to play recording</string>
- <!-- Smart Call -->
+ <!-- Sensor options -->
+ <string name="sensors_category_title">Sensor options</string>
+ <string name="smart_mute_title">Smart mute</string>
+ <string name="smart_mute_summary">Mute the incoming call by flipping the device</string>
<string name="smart_dialer_title">Smart call</string>
<string name="smart_dialer_summary">Automatically call the contact by moving your device to your ear</string>
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
index 3ac3ec3f7..06cef88fb 100644
--- a/res/xml/general_settings.xml
+++ b/res/xml/general_settings.xml
@@ -98,6 +98,25 @@
</PreferenceCategory>
<PreferenceCategory
+ android:key="dialer_general_sensors_category_key"
+ android:title="@string/sensors_category_title"
+ android:persistent="false">
+
+ <SwitchPreference
+ android:key="button_smart_dialer"
+ android:title="@string/smart_dialer_title"
+ android:summary="@string/smart_dialer_summary"
+ android:defaultValue="false" />
+
+ <SwitchPreference
+ android:key="button_smart_mute"
+ android:title="@string/smart_mute_title"
+ android:summary="@string/smart_mute_summary"
+ android:defaultValue="false" />
+
+ </PreferenceCategory>
+
+ <PreferenceCategory
android:key="dialer_general_other_settings_category_key"
android:title="@string/other_settings_title"
android:persistent="false" >
@@ -107,12 +126,6 @@
android:title="@string/detailed_incall_info_title"
android:summary="@string/detailed_incall_info_summary" />
- <SwitchPreference
- android:key="button_smart_dialer"
- android:title="@string/smart_dialer_title"
- android:summary="@string/smart_dialer_summary"
- android:defaultValue="false" />
-
<PreferenceScreen
android:key="button_respond_via_sms_key"
android:title="@string/respond_via_sms_setting_title"
diff --git a/src/com/android/dialer/settings/GeneralSettingsFragment.java b/src/com/android/dialer/settings/GeneralSettingsFragment.java
index 7bc52d8aa..648e9a5e4 100644
--- a/src/com/android/dialer/settings/GeneralSettingsFragment.java
+++ b/src/com/android/dialer/settings/GeneralSettingsFragment.java
@@ -55,6 +55,7 @@ public class GeneralSettingsFragment extends PreferenceFragment
private static final String BUTTON_SPEED_DIAL_KEY = "speed_dial_settings";
private static final String BUTTON_T9_SEARCH_INPUT_LOCALE = "button_t9_search_input";
public static final String BUTTON_SMART_DIALER_KEY = "button_smart_dialer";
+ public static final String BUTTON_SMART_MUTE_KEY = "button_smart_mute";
private static final int MSG_UPDATE_RINGTONE_SUMMARY = 1;