Adds ability to answer call with hardware HOME button (2/2)

(preparation to winter time) Change-Id: I25d69913847b1756f89a04e14e1dee4a939afcb3
thedeadfish59 · Sep 4, 2012 · c19ad69 · c19ad69
1 parent ebffa88
commit c19ad69
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 0 deletions.
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
@@ -1233,6 +1233,7 @@
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Большой текст"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Кнопка питания завершает вызов"</string>
+    <string name="accessibility_home_button_answers_call_title">"Кнопка Домой отвечает на вызов"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Озвучивать пароли"</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Задержка при нажатии и удержании"</string>
     <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Расширение доступности"</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -2980,6 +2980,8 @@
     <string name="accessibility_system_title">System</string>
     <!-- Title for the accessibility preference to enable large text. [CHAR LIMIT=35] -->
     <string name="accessibility_toggle_large_text_title">Large text</string>
+<!-- Title for the accessibility preference to home button to answers a call. [CHAR LIMIT=35] -->
+    <string name="accessibility_home_button_answers_call_title">Home button answers call.</string>
     <!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
     <string name="accessibility_power_button_ends_call_title">Power button ends call</string>
     <!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->

diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
@@ -37,6 +37,11 @@
                 android:title="@string/accessibility_power_button_ends_call_title"
                 android:persistent="false"/>
 
+        <CheckBoxPreference
+                android:key="toggle_home_button_answers_call_preference"
+                android:title="@string/accessibility_home_button_answers_call_title"
+                android:persistent="false"/>
+
         <CheckBoxPreference
                 android:key="toggle_lock_screen_rotation_preference"
                 android:title="@string/accelerometer_title"

diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
@@ -99,6 +99,8 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
     private static final String TOGGLE_LARGE_TEXT_PREFERENCE = "toggle_large_text_preference";
     private static final String TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE =
         "toggle_power_button_ends_call_preference";
+    private static final String TOGGLE_HOME_BUTTON_ANSWERS_CALL_PREFERENCE =
+        "toggle_home_button_answers_call_preference";
     private static final String TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE =
         "toggle_lock_screen_rotation_preference";
     private static final String TOGGLE_SPEAK_PASSWORD_PREFERENCE =
@@ -159,6 +161,7 @@ public void onChange() {
 
     private CheckBoxPreference mToggleLargeTextPreference;
     private CheckBoxPreference mTogglePowerButtonEndsCallPreference;
+    private CheckBoxPreference mToggleHomeButtonAnswersCallPreference;
     private CheckBoxPreference mToggleLockScreenRotationPreference;
     private CheckBoxPreference mToggleSpeakPasswordPreference;
     private ListPreference mSelectLongPressTimeoutPreference;
@@ -215,6 +218,9 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
         } else if (mTogglePowerButtonEndsCallPreference == preference) {
             handleTogglePowerButtonEndsCallPreferenceClick();
             return true;
+        } else if (mToggleHomeButtonAnswersCallPreference == preference) {
+            handleToggleHomeButtonAnswersCallPreferenceClick();
+            return true;
         } else if (mToggleLockScreenRotationPreference == preference) {
             handleLockScreenRotationPreferenceClick();
             return true;
@@ -241,6 +247,13 @@ private void handleTogglePowerButtonEndsCallPreferenceClick() {
                         : Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF));
     }
 
+    private void handleToggleHomeButtonAnswersCallPreferenceClick() {
+        Settings.Secure.putInt(getContentResolver(),
+                Settings.Secure.RING_HOME_BUTTON_BEHAVIOR,
+                (mToggleHomeButtonAnswersCallPreference.isChecked()
+                        ? Settings.Secure.RING_HOME_BUTTON_BEHAVIOR_ANSWER
+                        : Settings.Secure.RING_HOME_BUTTON_BEHAVIOR_DO_NOTHING));
+    }
     private void handleLockScreenRotationPreferenceClick() {
         RotationPolicy.setRotationLockForAccessibility(getActivity(),
                 !mToggleLockScreenRotationPreference.isChecked());
@@ -267,6 +280,13 @@ private void initializeAllPreferences() {
                 || !Utils.isVoiceCapable(getActivity())) {
             mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference);
         }
+        // Home button answers calls.
+        mToggleHomeButtonAnswersCallPreference =
+            (CheckBoxPreference) findPreference(TOGGLE_HOME_BUTTON_ANSWERS_CALL_PREFERENCE);
+        if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_HOME)
+                || !Utils.isVoiceCapable(getActivity())) {
+            mSystemsCategory.removePreference(mToggleHomeButtonAnswersCallPreference);
+        }
 
         // Lock screen rotation.
         mToggleLockScreenRotationPreference =
@@ -427,6 +447,17 @@ private void updateSystemPreferences() {
             mTogglePowerButtonEndsCallPreference.setChecked(powerButtonEndsCall);
         }
 
+        // Home button answers calls.
+        if (KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_HOME)
+                && Utils.isVoiceCapable(getActivity())) {
+            final int incallHomeBehavior = Settings.Secure.getInt(getContentResolver(),
+                    Settings.Secure.RING_HOME_BUTTON_BEHAVIOR,
+                    Settings.Secure.RING_HOME_BUTTON_BEHAVIOR_DEFAULT);
+            final boolean homeButtonAnswersCall =
+                (incallHomeBehavior == Settings.Secure.RING_HOME_BUTTON_BEHAVIOR_ANSWER);
+            mToggleHomeButtonAnswersCallPreference.setChecked(homeButtonAnswersCall);
+        }
+
         // Auto-rotate screen
         updateLockScreenRotationCheckbox();