Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96c47d45 authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'mwd-merge-040115' 

* changes:
  Merge commit '279cb4a5' into merge
  Merge commit '898e4864' into merge
  Merge commit 'fc75374b' into merge
  Merge commit '22416075' into merge
  Merge commit 'fe475227' into merge
parents 1321412c 9093b6eb

res/values/strings.xml

+3 −9
Original line number Diff line number Diff line
@@ -1799,7 +1799,7 @@ 
    <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->

    <string name="wifi_calling_settings_title">Wi-Fi calling</string>

    <!-- WFC mode [CHAR LIMIT=30] -->

    <string name="wifi_calling_mode_title">Wi-Fi calling mode</string>

    <string name="wifi_calling_mode_title">Calling preference</string>

    <!-- WFC mode dialog [CHAR LIMIT=30] -->

    <string name="wifi_calling_mode_dialog_title">Wi-Fi calling mode</string>

    <string-array name="wifi_calling_mode_choices">
@@ -1812,14 +1812,8 @@ 
        <item>"1"</item>

        <item>"0"</item>

    </string-array>

    <!-- WFC, summary for Disabled [CHAR LIMIT=100] -->

    <string name="wifi_calling_off_summary">Off</string>

    <!-- WFC, summary for Wi-Fi Preferred [CHAR LIMIT=100] -->

    <string name="wfc_mode_wifi_preferred_summary">Wi-Fi preferred (Uses cell network only if Wi-Fi isn\'t available)</string>

    <!-- WFC, summary for Cellular Preferred [CHAR LIMIT=100] -->

    <string name="wfc_mode_cellular_preferred_summary">Cellular preferred (Uses Wi-Fi only if cell network isn\'t available)</string>

    <!-- WFC, summary for Wi-Fi Only [CHAR LIMIT=100] -->

    <string name="wfc_mode_wifi_only_summary">Wi-Fi only (Never uses cell network. Can\'t make or receive calls if Wi-Fi isn\'t available)</string>

    <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->

    <string name="wifi_calling_off_explanation">When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your carrier\'s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your carrier regarding fees and other details.</string>



    <!-- Sound and alerts settings -->

    <skip/>

res/xml/wireless_settings.xml

+6 −6
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ 
        android:summary="@string/nfc_quick_toggle_summary"

        android:persistent="false" />



    <PreferenceScreen

        android:key="wifi_calling_settings"

        android:title="@string/wifi_calling_settings_title"

        settings:keywords="@string/keywords_wifi_calling"

        android:fragment="com.android.settings.WifiCallingSettings" />



    <PreferenceScreen

        android:fragment="com.android.settings.nfc.AndroidBeam"

        android:key="android_beam_settings"
@@ -63,12 +69,6 @@ 
            android:targetClass="com.android.phone.MobileNetworkSettings" />

    </PreferenceScreen>



    <PreferenceScreen

        android:key="wifi_calling_settings"

        android:title="@string/wifi_calling_settings_title"

        settings:keywords="@string/keywords_wifi_calling"

        android:fragment="com.android.settings.WifiCallingSettings" />



    <Preference

        android:key="manage_mobile_plan"

        android:title="@string/manage_mobile_plan_title"

src/com/android/settings/WifiCallingSettings.java

+19 −5
Original line number Diff line number Diff line
@@ -25,10 +25,12 @@ import android.content.IntentFilter; 
import android.os.Bundle;

import android.preference.ListPreference;

import android.preference.Preference;

import android.preference.PreferenceScreen;

import android.telephony.PhoneStateListener;

import android.telephony.TelephonyManager;

import android.util.Log;

import android.widget.Switch;

import android.widget.TextView;



import com.android.ims.ImsConfig;

import com.android.ims.ImsManager;
@@ -53,6 +55,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment 
    private SwitchBar mSwitchBar;

    private Switch mSwitch;

    private ListPreference mButtonWfcMode;

    private TextView mEmptyView;



    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {

        /*
@@ -90,6 +93,10 @@ public class WifiCallingSettings extends SettingsPreferenceFragment 
        mSwitchBar = activity.getSwitchBar();

        mSwitch = mSwitchBar.getSwitch();

        mSwitchBar.show();



        mEmptyView = (TextView) getView().findViewById(android.R.id.empty);

        getListView().setEmptyView(mEmptyView);

        mEmptyView.setText(R.string.wifi_calling_off_explanation);

    }



    @Override
@@ -107,7 +114,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment 
        AlertDialog.Builder builder = new AlertDialog.Builder(context);

        builder.setMessage(message)

                .setTitle(title)

                .setIcon(android.R.drawable.stat_sys_warning)

                .setIcon(android.R.drawable.ic_dialog_alert)

                .setPositiveButton(android.R.string.ok, null);

        AlertDialog dialog = builder.create();

        dialog.show();
@@ -212,6 +219,13 @@ public class WifiCallingSettings extends SettingsPreferenceFragment 
        int wfcMode = ImsManager.getWfcMode(context);

        mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));

        mButtonWfcMode.setEnabled(isChecked);



        final PreferenceScreen preferenceScreen = getPreferenceScreen();

        if (isChecked) {

            preferenceScreen.addPreference(mButtonWfcMode);

        } else {

            preferenceScreen.removePreference(mButtonWfcMode);

        }

    }



    @Override
@@ -230,17 +244,17 @@ public class WifiCallingSettings extends SettingsPreferenceFragment 
    }



    static int getWfcModeSummary(Context context, int wfcMode) {

        int resId = R.string.wifi_calling_off_summary;

        int resId = com.android.internal.R.string.wifi_calling_off_summary;

        if (ImsManager.isWfcEnabledByUser(context)) {

            switch (wfcMode) {

                case ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY:

                    resId = R.string.wfc_mode_wifi_only_summary;

                    resId = com.android.internal.R.string.wfc_mode_wifi_only_summary;

                    break;

                case ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED:

                    resId = R.string.wfc_mode_cellular_preferred_summary;

                    resId = com.android.internal.R.string.wfc_mode_cellular_preferred_summary;

                    break;

                case ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED:

                    resId = R.string.wfc_mode_wifi_preferred_summary;

                    resId = com.android.internal.R.string.wfc_mode_wifi_preferred_summary;

                    break;

                default:

                    Log.e(TAG, "Unexpected WFC mode value: " + wfcMode);

src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ public final class BluetoothNameDialogFragment extends DialogFragment implements 
        } else {

            mDeviceNameEdited = true;

            if (mOkButton != null) {

                mOkButton.setEnabled(s.length() != 0);

                mOkButton.setEnabled(s.toString().trim().length() != 0);

            }

        }

    }