Settings: Add back Accessibility

Also, only show speeddial if the user is the primary.
This is how it used to be.

Change-Id: I07cccd04f4825f2f80fee06c7e8a6bdca5f70932

1 files changed, 16 insertions, 8 deletions

diff --git a/src/com/android/dialer/settings/DialerSettingsActivity.java b/src/com/android/dialer/settings/DialerSettingsActivity.java
index 2e3abab72..b8c7d8aa3 100644
--- a/src/com/android/dialer/settings/DialerSettingsActivity.java
+++ b/src/com/android/dialer/settings/DialerSettingsActivity.java
@@ -159,6 +159,22 @@ public class DialerSettingsActivity extends PreferenceActivity {
                 phoneAccountSettingsHeader.intent = phoneAccountSettingsIntent;
                 target.add(phoneAccountSettingsHeader);
             }
+
+            if (telephonyManager.isTtyModeSupported()
+                    || telephonyManager.isHearingAidCompatibilitySupported()) {
+                Header accessibilitySettingsHeader = new Header();
+                Intent accessibilitySettingsIntent =
+                        new Intent(TelecomManager.ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS);
+                accessibilitySettingsHeader.titleRes = R.string.accessibility_settings_title;
+                accessibilitySettingsHeader.intent = accessibilitySettingsIntent;
+                target.add(accessibilitySettingsHeader);
+            }
+
+            Header speedDialHeader = new Header();
+            Intent speedDialIntent = new Intent("com.android.phone.action.SPEED_DIAL_SETTINGS");
+            speedDialHeader.titleRes = R.string.speed_dial_settings;
+            speedDialHeader.intent = speedDialIntent;
+            target.add(speedDialHeader);
         }
 
         if (mSelectedProvider != null && mSelectedProviderInfo != null) {
@@ -181,12 +197,6 @@ public class DialerSettingsActivity extends PreferenceActivity {
             target.add(blockHidden);
         }
 
-        Header speedDialHeader = new Header();
-        Intent speedDialIntent = new Intent("com.android.phone.action.SPEED_DIAL_SETTINGS");
-        speedDialHeader.titleRes = R.string.speed_dial_settings;
-        speedDialHeader.intent = speedDialIntent;
-        target.add(speedDialHeader);
-
         if (mCallProviders != null) {
             for (CallMethodInfo cmi : mCallProviders) {
                 if (cmi.mStatus == PluginStatus.ENABLED || cmi.mStatus ==
@@ -214,8 +224,6 @@ public class DialerSettingsActivity extends PreferenceActivity {
             }
         }
 
-
-
         // invalidateHeaders does not rebuild
         // the list properly, so if an adapter is present already
         // then we've invalidated and need make sure we notify the list.