diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 61257f8f..b5e3e002 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,6 +28,8 @@
 
     <original-package android:name="com.android.phone" />
 
+    <protected-broadcast android:name="android.telecom.action.TTY_PREFERRED_MODE_CHANGED" />
+    <protected-broadcast android:name="android.telecom.action.CURRENT_TTY_MODE_CHANGED" />
     <protected-broadcast android:name="android.intent.action.SERVICE_STATE" />
     <protected-broadcast android:name="android.intent.action.RADIO_TECHNOLOGY" />
     <protected-broadcast android:name="android.intent.action.EMERGENCY_CALLBACK_MODE_CHANGED" />
diff --git a/res/values-de/yaosp_strings.xml b/res/values-de/yaosp_strings.xml
new file mode 100644
index 00000000..0bcd4415
--- /dev/null
+++ b/res/values-de/yaosp_strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 Yank555.lu Android Open Source Project
+     Copyright (C) 2012-2015 SlimRoms Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Proximity speaker -->
+    <string name="display_category_prox_auto_speaker_title">Freisprecheinrichtung Einstellungen</string>
+    <string name="prox_auto_speaker_title">Automatische Annäherungssensor Freisprecheinrichtung</string>
+    <string name="prox_auto_speaker_summary">Aktiviert die Freisprecheinrichtung wenn das Gerät vom Gesicht entfernt wird.</string>
+    <string name="prox_auto_speaker_delay_title">Annäherungssensor Verzögerung</string>
+    <string name="prox_auto_speaker_delay_summary">Verzögerung bis Lautsprecher eingeschaltet wird</string>
+    <string name="prox_auto_speaker_incall_only_title">Nur bei eingehenden Anrufen</string>
+    <string name="prox_auto_speaker_incall_only_summary_on">Bei ausgehenden Anrufen wird der Lautsprecher erst eingeschaltet nachdem der andere Teilnehmer abnimmt</string>
+    <string name="prox_auto_speaker_incall_only_summary_off">Der Lautsprecher wird immer wärend eines Anrufes eingeschaltet (Standard)</string>
+
+    <!-- Setting title for the flip action setting. -->
+    <string name="flip_action_title">Umdreh-Aktion</string>
+
+    <!-- Dialog title of the flip action setting. -->
+    <string name="flip_action_dialog_title">Gerät umdrehen um\u2026</string>
+
+    <!-- Setting summary for the flip action setting. -->
+    <string name="flip_action_summary">Gerät umdrehen wird <xliff:g id="action">%s</xliff:g></string>
+
+    <!-- Values for flip action array entries -->
+    <string name="entry_do_nothing">Nichts zu tun</string>
+    <string name="entry_mute_ringer">Klingelton stumm zu schalten</string>
+    <string name="entry_dismiss_call">Anruf zu beenden</string>
+    <string name="summary_do_nothing">nichts tun</string>
+    <string name="summary_mute_ringer">den Klingelton stumm schalten</string>
+    <string name="summary_dismiss_call">den Anruf beenden</string>
+
+    <!-- Title for the option managing whether or not to use intrusive incall UI. -->
+    <string name="use_intrusive_call_title">Vollbild Anrufanzeige</string>
+    <string name="use_intrusive_call_summary">Eingehende Anrufe in Vollbild anzeigen selbst bei nicht gesperrtem Bildschirm</string>
+
+    <!-- Title for the option managing whether or not to show data connection type when roaming. -->
+    <string name="roaming_dataconnection_title">Verbindungsart beim Daten-Roaming anzeigen</string>
+    <string name="roaming_dataconnection_summary">Beim Daten-Roaming die Datenverbindungsart (LTE, 3G, H...) in der Statusleiste / QS Kachel anzeigen wenn Daten verbunden sind (statt nur "R")</string>
+
+</resources>
diff --git a/res/values-fr/yaosp_strings.xml b/res/values-fr/yaosp_strings.xml
new file mode 100644
index 00000000..863e5ec8
--- /dev/null
+++ b/res/values-fr/yaosp_strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 Yank555.lu Android Open Source Project
+     Copyright (C) 2012-2015 SlimRoms Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Proximity speaker -->
+    <string name="display_category_prox_auto_speaker_title">Réglages mains libres par proximité</string>
+    <string name="prox_auto_speaker_title">Mains libres automatique</string>
+    <string name="prox_auto_speaker_summary">Activer le mode mains libres dès que le téléphone est éloigné du visage</string>
+    <string name="prox_auto_speaker_delay_title">Délai mains libres automatique</string>
+    <string name="prox_auto_speaker_delay_summary">Délai avant d\'activer le mode mains libres</string>
+    <string name="prox_auto_speaker_incall_only_title">Uniquement pendant un appel</string>
+    <string name="prox_auto_speaker_incall_only_summary_on">Lors d\'appels sortants le haut parleur ne sera activé que lorseque l\'appelé déchroche</string>
+    <string name="prox_auto_speaker_incall_only_summary_off">Le haut parleur sera actif dès que vous êtes en ligne (défaut)</string>
+
+    <!-- Setting title for the flip action setting. -->
+    <string name="flip_action_title">Retourner le téléphone</string>
+
+    <!-- Dialog title of the flip action setting. -->
+    <string name="flip_action_dialog_title">Retourner le téléphone pour\u2026</string>
+
+    <!-- Setting summary for the flip action setting. -->
+    <string name="flip_action_summary">Retourner le téléphone <xliff:g id="action">%s</xliff:g></string>
+
+    <!-- Values for flip action array entries -->
+    <string name="entry_do_nothing">Ne rien faire</string>
+    <string name="entry_mute_ringer">Arréter la sonnerie</string>
+    <string name="entry_dismiss_call">Refuser l\'appel</string>
+    <string name="summary_do_nothing">ne fera rien</string>
+    <string name="summary_mute_ringer">arrêtera la sonnerie</string>
+    <string name="summary_dismiss_call">refuserera l\'appel</string>
+
+    <!-- Title for the option managing whether or not to use intrusive incall UI. -->
+    <string name="use_intrusive_call_title">Notification d\'appel en plein écran</string>
+    <string name="use_intrusive_call_summary">Notifier les appels entrant en plein écran même si l\'appareil n\'est pas vérouillé</string>
+
+    <!-- Title for the option managing whether or not to show data connection type when roaming. -->
+    <string name="roaming_dataconnection_title">Afficher type de connection de données an itinérance</string>
+    <string name="roaming_dataconnection_summary">Afficher le type de connection de données (LTE, 3G, H...) dans l\'icône de la barre d\'état / tuile QS lorsque en itinérance les données sont connectées (au lieu de simplement "R")</string>
+
+</resources>
diff --git a/res/values-hu/yaosp_strings.xml b/res/values-hu/yaosp_strings.xml
new file mode 100644
index 00000000..cdf2e9a9
--- /dev/null
+++ b/res/values-hu/yaosp_strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2015 SlimRoms Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Proximity speaker -->
+    <string name="display_category_prox_auto_speaker_title">Kihangosító beállítások</string>
+    <string name="prox_auto_speaker_title">Automatikus kihangosító mód</string>
+    <string name="prox_auto_speaker_summary">Ha a telefon az arctól eltávolodik, a kihangosító mód automatikusan bekapcsol</string>
+    <string name="prox_auto_speaker_delay_title">Kihangosító mód késleltetés</string>
+    <string name="prox_auto_speaker_delay_summary">Idő, miután a kihangosító mód aktiválódik</string>
+    <string name="prox_auto_speaker_incall_only_title">Csak hívás közben</string>
+    <string name="prox_auto_speaker_incall_only_summary_on">A kimenő hívások esetén a kihangosító mód csak akkor lesz aktív, ha a fogadó fél válaszolt</string>
+    <string name="prox_auto_speaker_incall_only_summary_off">A kihangosító mód az összes bejövő hívásnál aktív (alapértelmezett)</string>
+
+    <!-- Setting title for the flip action setting. -->
+    <string name="flip_action_title">Lefordítási művelet</string>
+
+    <!-- Dialog title of the flip action setting. -->
+    <string name="flip_action_dialog_title">A telefon lefordításakor\u2026</string>
+
+    <!-- Setting summary for the flip action setting. -->
+    <string name="flip_action_summary">A telefon lefordításakor <xliff:g id="action">%s</xliff:g></string>
+
+    <!-- Values for flip action array entries -->
+    <string name="entry_do_nothing">Nem történik semmi</string>
+    <string name="entry_mute_ringer">Csengés elnémítása</string>
+    <string name="entry_dismiss_call">Hívás elutasítása</string>
+    <string name="summary_do_nothing">nem történik semmi</string>
+    <string name="summary_mute_ringer">a csengést elnémítja</string>
+    <string name="summary_dismiss_call">a bejövő hívásokat elutasítja</string>
+
+    <!-- Title for the option managing whether or not to use intrusive incall UI. -->
+    <string name="use_intrusive_call_title">Tolakodó bejövő hívás</string>
+    <string name="use_intrusive_call_summary">Teljes kijelzős értesítés bejövő hívásnál akkor is ha a képernyő nincs lezárva</string>
+
+    <!-- Title for the option managing whether or not to show data connection type when roaming. -->
+    <string name="roaming_dataconnection_title">Adatkapcsolat kijelzése barangoláskor</string>
+    <string name="roaming_dataconnection_summary">Kijelzi az adatkapcsolat típusát (LTE, 3G, H...) az állapotsávon / gyorsbeállítás ikonon ha a barangolás (roaming) és az adatkapcsolat aktív (az "R" helyett)</string>
+
+</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 0b1f93c8..b8cb1e30 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -218,4 +218,7 @@
 
     <!-- Whether the emergency only account can make emergency calls -->
     <bool name="config_pstnCanPlaceEmergencyCalls">true</bool>
+
+    <!-- Disable speaker proximity preference for problematic devices -->
+    <bool name="config_enabled_speakerprox" translatable="false">true</bool>
 </resources>
diff --git a/res/values/yaosp_arrays.xml b/res/values/yaosp_arrays.xml
new file mode 100644
index 00000000..da345eab
--- /dev/null
+++ b/res/values/yaosp_arrays.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 Yank555.lu Android Open Source Project
+     Copyright (C) 2012-2014 SlimRoms Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+
+    <!-- Values for the flip action settings. -->
+    <string-array name="flip_action_setting_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <!-- Entries listed in the setting for the flip action. -->
+    <string-array name="flip_action_setting_entries">
+        <item>@string/entry_mute_ringer</item>
+        <item>@string/entry_dismiss_call</item>
+        <item>@string/entry_do_nothing</item>
+    </string-array>
+
+    <!-- Summary texts for flip action. Must be ordered by numerical
+         value (do mute = 0, dismiss = 1, nothing = 2 (default)) -->
+    <string-array name="flip_action_summary_entries">
+        <item>@string/summary_mute_ringer</item>
+        <item>@string/summary_dismiss_call</item>
+        <item>@string/summary_do_nothing</item>
+    </string-array>
+
+</resources>
diff --git a/res/values/yaosp_strings.xml b/res/values/yaosp_strings.xml
new file mode 100644
index 00000000..5424bad1
--- /dev/null
+++ b/res/values/yaosp_strings.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2015 SlimRoms Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Proximity speaker -->
+    <string name="display_category_prox_auto_speaker_title">Proximity speaker settings</string>
+    <string name="prox_auto_speaker_title">Automatic proximity speaker</string>
+    <string name="prox_auto_speaker_summary">Enable speakerphone when the device is removed from your face</string>
+    <string name="prox_auto_speaker_delay_title">Proximity speaker delay</string>
+    <string name="prox_auto_speaker_delay_summary">Time delay before speaker is activated</string>
+    <string name="prox_auto_speaker_incall_only_title">Only while in call</string>
+    <string name="prox_auto_speaker_incall_only_summary_on">On outgoing calls, listener will only become active after the receiving party answers</string>
+    <string name="prox_auto_speaker_incall_only_summary_off">Listener will be active during all offhook call states (default)</string>
+
+    <!-- Setting title for the flip action setting. -->
+    <string name="flip_action_title">Flip action</string>
+
+    <!-- Dialog title of the flip action setting. -->
+    <string name="flip_action_dialog_title">Flip device to\u2026</string>
+
+    <!-- Setting summary for the flip action setting. -->
+    <string name="flip_action_summary">Flipping the phone down will <xliff:g id="action">%s</xliff:g></string>
+
+    <!-- Values for flip action array entries -->
+    <string name="entry_do_nothing">Do nothing</string>
+    <string name="entry_mute_ringer">Mute ringer</string>
+    <string name="entry_dismiss_call">Dismiss call</string>
+    <string name="summary_do_nothing">do nothing</string>
+    <string name="summary_mute_ringer">mute the ringer</string>
+    <string name="summary_dismiss_call">dismiss the call</string>
+
+    <!-- Title for the option managing whether or not to use intrusive incall UI. -->
+    <string name="use_intrusive_call_title">Intrusive incoming calls</string>
+    <string name="use_intrusive_call_summary">Show a full screen notification on incoming call even when not on lockscreen</string>
+
+    <!-- Title for the option managing whether or not to show data connection type when roaming. -->
+    <string name="roaming_dataconnection_title">Show data connection type when roaming</string>
+    <string name="roaming_dataconnection_summary">Show data connection type (LTE, 3G, H...) in statusbar / QS icon when roaming and data is connected (instead of just "R")</string>
+
+</resources>
diff --git a/res/xml/call_feature_setting.xml b/res/xml/call_feature_setting.xml
index 6471b168..4736760d 100644
--- a/res/xml/call_feature_setting.xml
+++ b/res/xml/call_feature_setting.xml
@@ -70,4 +70,47 @@
         android:summary="@string/sum_cdma_call_settings"
         android:persistent="false" />
 
+    <ListPreference
+        android:key="flip_action"
+        android:title="@string/flip_action_title"
+        android:dialogTitle="@string/flip_action_dialog_title"
+        android:entries="@array/flip_action_setting_entries"
+        android:entryValues="@array/flip_action_setting_values"
+        android:persistent="false" />
+
+    <SwitchPreference
+        android:key="use_intrusive_call"
+        android:title="@string/use_intrusive_call_title"
+        android:summary="@string/use_intrusive_call_summary"
+        android:persistent="false" />
+
+    <PreferenceCategory
+            android:key="category_prox_auto_speaker"
+            android:title="@string/display_category_prox_auto_speaker_title" >
+
+        <SwitchPreference
+            android:key="prox_auto_speaker"
+            android:title="@string/prox_auto_speaker_title"
+            android:summary="@string/prox_auto_speaker_summary"
+            android:persistent="false"
+            android:defaultValue="false" />
+
+        <SlimSeekBarPreference
+            android:key="prox_auto_speaker_delay"
+            android:title="@string/prox_auto_speaker_delay_title"
+            android:summary="@string/prox_auto_speaker_delay_summary"
+            android:persistent="false"
+            android:dependency="prox_auto_speaker" />
+
+        <SwitchPreference
+            android:key="prox_auto_speaker_incall_only"
+            android:title="@string/prox_auto_speaker_incall_only_title"
+            android:summaryOff="@string/prox_auto_speaker_incall_only_summary_off"
+            android:summaryOn="@string/prox_auto_speaker_incall_only_summary_on"
+            android:persistent="false"
+            android:defaultValue="false"
+            android:dependency="prox_auto_speaker" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/res/xml/network_setting.xml b/res/xml/network_setting.xml
index 875e1f3c..017f4e13 100644
--- a/res/xml/network_setting.xml
+++ b/res/xml/network_setting.xml
@@ -28,6 +28,12 @@
         android:summaryOn="@string/roaming_enable"
         android:summaryOff="@string/roaming_disable"/>
 
+    <SwitchPreference
+        android:key="button_roaming_dataconnection_key"
+        android:title="@string/roaming_dataconnection_title"
+        android:persistent="false"
+        android:summary="@string/roaming_dataconnection_summary" />
+
     <ListPreference
         android:key="preferred_network_mode_key"
         android:title="@string/preferred_network_mode_title"
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index d74558f8..33fa5e4a 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -29,6 +29,7 @@
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.os.PersistableBundle;
+import android.os.PowerManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.CheckBoxPreference;
@@ -36,6 +37,8 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
+import android.preference.SlimSeekBarPreference;
+import android.preference.SwitchPreference;
 import android.provider.Settings;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
@@ -93,14 +96,23 @@ public class CallFeaturesSetting extends PreferenceActivity
     private static final String VOICEMAIL_SETTING_SCREEN_PREF_KEY = "button_voicemail_category_key";
     private static final String BUTTON_FDN_KEY   = "button_fdn_key";
     private static final String BUTTON_RETRY_KEY       = "button_auto_retry_key";
+
+    private static final String PROX_AUTO_SPEAKER  = "prox_auto_speaker";
+    private static final String PROX_AUTO_SPEAKER_DELAY  = "prox_auto_speaker_delay";
+    private static final String PROX_AUTO_SPEAKER_INCALL_ONLY  = "prox_auto_speaker_incall_only";
+
     private static final String BUTTON_GSM_UMTS_OPTIONS = "button_gsm_more_expand_key";
     private static final String BUTTON_CDMA_OPTIONS = "button_cdma_more_expand_key";
 
     private static final String PHONE_ACCOUNT_SETTINGS_KEY =
             "phone_account_settings_preference_screen";
 
+    private static final String USE_INTRUSIVE_CALL_KEY = "use_intrusive_call";
+
     private static final String ENABLE_VIDEO_CALLING_KEY = "button_enable_video_calling";
 
+    private static final String FLIP_ACTION_KEY = "flip_action";
+
     private Phone mPhone;
     private SubscriptionInfoHelper mSubscriptionInfoHelper;
     private TelecomManager mTelecomManager;
@@ -109,6 +121,12 @@ public class CallFeaturesSetting extends PreferenceActivity
     private PreferenceScreen mVoicemailSettingsScreen;
     private CheckBoxPreference mEnableVideoCalling;
 
+    private ListPreference mFlipAction;
+    private SwitchPreference mProxSpeaker;
+    private SlimSeekBarPreference mProxSpeakerDelay;
+    private SwitchPreference mProxSpeakerIncallOnly;
+    private SwitchPreference mUseIntrusiveCall;
+
     /*
      * Click Listeners, handle click based on objects attached to UI.
      */
@@ -121,6 +139,13 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
                     android.provider.Settings.Global.CALL_AUTO_RETRY,
                     mButtonAutoRetry.isChecked() ? 1 : 0);
             return true;
+        } else if (preference == mProxSpeaker) {
+            Settings.System.putInt(getContentResolver(), Settings.System.PROXIMITY_AUTO_SPEAKER,
+                    mProxSpeaker.isChecked() ? 1 : 0);
+        } else if (preference == mProxSpeakerIncallOnly) {
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.PROXIMITY_AUTO_SPEAKER_INCALL_ONLY,
+                    mProxSpeakerIncallOnly.isChecked() ? 1 : 0);
         }
         return false;
     }
@@ -159,12 +184,32 @@ public void onClick(DialogInterface dialog, int which) {
                         .show();
                 return false;
             }
+        } else if (preference == mProxSpeakerDelay) {
+            int delay = Integer.valueOf((String) objValue);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.PROXIMITY_AUTO_SPEAKER_DELAY, delay);
+        } else if (preference == mFlipAction) {
+            int index = mFlipAction.findIndexOfValue((String) objValue);
+            Settings.System.putInt(getContentResolver(),
+                Settings.System.CALL_FLIP_ACTION_KEY, index);
+            updateFlipActionSummary(index);
+        } else if (preference == mUseIntrusiveCall) {
+            final boolean val = (Boolean) objValue;
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.USE_INTRUSIVE_CALL, val ? 1 : 0);
         }
 
         // Always let the preference setting proceed.
         return true;
     }
 
+    private void updateFlipActionSummary(int value) {
+        if (mFlipAction != null) {
+            String[] summaries = getResources().getStringArray(R.array.flip_action_summary_entries);
+            mFlipAction.setSummary(getString(R.string.flip_action_summary, summaries[value]));
+        }
+    }
+
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -205,6 +250,35 @@ protected void onResume() {
         }
 
         PreferenceScreen prefSet = getPreferenceScreen();
+
+        mFlipAction = (ListPreference) findPreference(FLIP_ACTION_KEY);
+        if (mFlipAction != null) {
+            int flipAction = Settings.System.getInt(getContentResolver(),
+                    Settings.System.CALL_FLIP_ACTION_KEY, 2);
+            mFlipAction.setValue(String.valueOf(flipAction));
+            updateFlipActionSummary(flipAction);
+            mFlipAction.setOnPreferenceChangeListener(this);
+        }
+
+        mProxSpeaker = (SwitchPreference) findPreference(PROX_AUTO_SPEAKER);
+        mProxSpeakerIncallOnly = (SwitchPreference) findPreference(PROX_AUTO_SPEAKER_INCALL_ONLY);
+        mProxSpeakerDelay = (SlimSeekBarPreference) findPreference(PROX_AUTO_SPEAKER_DELAY);
+        if (mProxSpeakerDelay != null) {
+            mProxSpeakerDelay.setDefault(100);
+            mProxSpeakerDelay.isMilliseconds(true);
+            mProxSpeakerDelay.setInterval(1);
+            mProxSpeakerDelay.minimumValue(100);
+            mProxSpeakerDelay.multiplyValue(100);
+            mProxSpeakerDelay.setOnPreferenceChangeListener(this);
+        }
+
+        mUseIntrusiveCall = (SwitchPreference) findPreference(USE_INTRUSIVE_CALL_KEY);
+        if (mUseIntrusiveCall != null) {
+            mUseIntrusiveCall.setChecked(Settings.System.getInt(getContentResolver(),
+                Settings.System.USE_INTRUSIVE_CALL, 0) != 0);
+            mUseIntrusiveCall.setOnPreferenceChangeListener(this);
+        }
+
         mVoicemailSettingsScreen =
                 (PreferenceScreen) findPreference(VOICEMAIL_SETTING_SCREEN_PREF_KEY);
         mVoicemailSettingsScreen.setIntent(mSubscriptionInfoHelper.getIntent(
@@ -322,6 +396,39 @@ protected void onResume() {
             }
             wifiCallingSettings.setSummary(resId);
         }
+
+        final ContentResolver contentResolver = getContentResolver();
+
+        if (mProxSpeaker != null) {
+            PowerManager pm = (PowerManager) this.getSystemService(Context.POWER_SERVICE);
+            if (pm.isWakeLockLevelSupported(
+                    PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)
+                    && getResources().getBoolean(R.bool.config_enabled_speakerprox)) {
+                mProxSpeaker.setChecked(Settings.System.getInt(contentResolver,
+                        Settings.System.PROXIMITY_AUTO_SPEAKER, 0) == 1);
+                if (mProxSpeakerIncallOnly != null) {
+                    mProxSpeakerIncallOnly.setChecked(Settings.System.getInt(contentResolver,
+                            Settings.System.PROXIMITY_AUTO_SPEAKER_INCALL_ONLY, 0) == 1);
+                }
+                if (mProxSpeakerDelay != null) {
+                    final int proxDelay = Settings.System.getInt(getContentResolver(),
+                            Settings.System.PROXIMITY_AUTO_SPEAKER_DELAY, 100);
+                    // minimum 100 is 1 interval of the 100 multiplier 
+                    mProxSpeakerDelay.setInitValue((proxDelay / 100) - 1);
+                }
+            } else {
+                prefSet.removePreference(mProxSpeaker);
+                mProxSpeaker = null;
+                if (mProxSpeakerIncallOnly != null) {
+                    prefSet.removePreference(mProxSpeakerIncallOnly);
+                    mProxSpeakerIncallOnly = null;
+                }
+                if (mProxSpeakerDelay != null) {
+                    prefSet.removePreference(mProxSpeakerDelay);
+                    mProxSpeakerDelay = null;
+                }
+            }
+        }
     }
 
     @Override
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 404c976a..761f7471 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -45,6 +45,7 @@
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
@@ -90,6 +91,8 @@ public class MobileNetworkSettings extends PreferenceActivity
     //String keys for preference lookup
     private static final String BUTTON_PREFERED_NETWORK_MODE = "preferred_network_mode_key";
     private static final String BUTTON_ROAMING_KEY = "button_roaming_key";
+    private static final String BUTTON_ROAMING_DATACONNECTION_KEY =
+            "button_roaming_dataconnection_key";
     private static final String BUTTON_CDMA_LTE_DATA_SERVICE_KEY = "cdma_lte_data_service_key";
     private static final String BUTTON_ENABLED_NETWORKS_KEY = "enabled_networks_key";
     private static final String BUTTON_4G_LTE_KEY = "enhanced_4g_lte";
@@ -112,6 +115,7 @@ public class MobileNetworkSettings extends PreferenceActivity
     private ListPreference mButtonPreferredNetworkMode;
     private ListPreference mButtonEnabledNetworks;
     private RestrictedSwitchPreference mButtonDataRoam;
+    private SwitchPreference mButtonDataRoamConn;
     private SwitchPreference mButton4glte;
     private Preference mLteDataServicePref;
 
@@ -246,6 +250,9 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
         } else if (preference == mButtonDataRoam) {
             // Do not disable the preference screen if the user clicks Data roaming.
             return true;
+        } else if (preference == mButtonDataRoamConn) {
+            // Do not disable the preference screen if the user clicks Data roaming.
+            return true;
         } else {
             // if the button is anything but the simple toggle preference,
             // we'll need to disable all preferences to reject all click
@@ -453,11 +460,14 @@ protected void onCreate(Bundle icicle) {
         PreferenceScreen prefSet = getPreferenceScreen();
 
         mButtonDataRoam = (RestrictedSwitchPreference) prefSet.findPreference(BUTTON_ROAMING_KEY);
+        mButtonDataRoamConn = (SwitchPreference) prefSet.findPreference(
+                BUTTON_ROAMING_DATACONNECTION_KEY);
         mButtonPreferredNetworkMode = (ListPreference) prefSet.findPreference(
                 BUTTON_PREFERED_NETWORK_MODE);
         mButtonEnabledNetworks = (ListPreference) prefSet.findPreference(
                 BUTTON_ENABLED_NETWORKS_KEY);
         mButtonDataRoam.setOnPreferenceChangeListener(this);
+        mButtonDataRoamConn.setOnPreferenceChangeListener(this);
 
         mLteDataServicePref = prefSet.findPreference(BUTTON_CDMA_LTE_DATA_SERVICE_KEY);
 
@@ -537,6 +547,7 @@ private void updateBody() {
         if (prefSet != null) {
             prefSet.removeAll();
             prefSet.addPreference(mButtonDataRoam);
+            prefSet.addPreference(mButtonDataRoamConn);
             prefSet.addPreference(mButtonPreferredNetworkMode);
             prefSet.addPreference(mButtonEnabledNetworks);
             prefSet.addPreference(mButton4glte);
@@ -722,6 +733,10 @@ private void updateBody() {
 
         // Get the networkMode from Settings.System and displays it
         mButtonDataRoam.setChecked(mPhone.getDataRoamingEnabled());
+        mButtonDataRoamConn.setChecked(
+                Settings.System.getIntForUser(mPhone.getContext().getContentResolver(),
+                        Settings.System.DATACONNECTION_WHEN_ROAMING, 0,
+                        UserHandle.USER_CURRENT) == 1);
         mButtonEnabledNetworks.setValue(Integer.toString(settingsNetworkMode));
         mButtonPreferredNetworkMode.setValue(Integer.toString(settingsNetworkMode));
         UpdatePreferredNetworkModeSummary(settingsNetworkMode);
@@ -747,6 +762,7 @@ private void updateBody() {
                 carrierConfig.getBoolean(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);
         mButtonDataRoam.setDisabledByAdmin(false);
         mButtonDataRoam.setEnabled(hasActiveSubscriptions);
+        mButtonDataRoamConn.setEnabled(hasActiveSubscriptions);
         if (mButtonDataRoam.isEnabled()) {
             if (RestrictedLockUtils.hasBaseUserRestriction(context,
                     UserManager.DISALLOW_DATA_ROAMING, UserHandle.myUserId())) {
@@ -932,6 +948,11 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
                 mPhone.setDataRoamingEnabled(false);
             }
             return true;
+        } else if (preference == mButtonDataRoamConn) {
+            Settings.System.putIntForUser(mPhone.getContext().getContentResolver(),
+                    Settings.System.DATACONNECTION_WHEN_ROAMING,
+                    mButtonDataRoamConn.isChecked() ? 0 : 1, UserHandle.USER_CURRENT);
+            return true;
         }
 
         updateBody();
diff --git a/src/com/android/phone/NetworkSetting.java b/src/com/android/phone/NetworkSetting.java
index a09c5c53..ace58796 100644
--- a/src/com/android/phone/NetworkSetting.java
+++ b/src/com/android/phone/NetworkSetting.java
@@ -162,7 +162,7 @@ public void onServiceConnected(ComponentName className, IBinder service) {
             if (DBG) log("connection created, binding local service.");
             mNetworkQueryService = ((NetworkQueryService.LocalBinder) service).getService();
             // as soon as it is bound, run a query.
-            loadNetworksList();
+//            loadNetworksList();
         }
 
         /** Handle the task of cleaning up the local binding */