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

Commit 4ab32563 authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak
Browse files

Add Wi-Fi Calling preference screen 

Change-Id: Ie89902b55c5c4184236636f5039b3246a9c0bda5
parent 2e2582c7

AndroidManifest.xml

+17 −0
Original line number Diff line number Diff line
@@ -2058,6 +2058,23 @@ 
            </intent-filter>

        </activity>



        <activity android:name="Settings$WifiCallingSettingsActivity"

                  android:label="@string/wifi_calling_settings_title"

                  android:taskAffinity="">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.WIFI_CALLING_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

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

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                       android:resource="@id/wireless_settings" />

        </activity>



        <provider

            android:name=".search.SettingsSearchIndexablesProvider"

            android:authorities="com.android.settings"

res/values/strings.xml

+29 −0
Original line number Diff line number Diff line
@@ -1884,6 +1884,35 @@ 
         Label on Wifi Configuration screen-->

    <string name="config_list_label" translatable="false">Configured networks</string>



    <!-- Wireless networks, item title to go into the WFC settings -->

    <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>

    <!-- 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">

        <item>Wi-Fi preferred</item>

        <item>Cellular preferred</item>

        <item>Wi-Fi only</item>

    </string-array>

    <string-array name="wifi_calling_mode_values">

        <item>"2"</item>

        <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>

    <!-- WFC roam enable/disable [CHAR LIMIT=30] -->

    <string name="wifi_calling_roam_title">WFC handoff while roaming</string>

    <!-- WFC roam summary [CHAR LIMIT=80] -->

    <string name="wifi_calling_roam_summary">Allow Wi-Fi voice calls handoff to cell network when roaming</string>



    <!-- Sound and alerts settings -->

    <skip/>

    <!-- Main Settings screen setting option name to go into the display settings screen -->

res/xml/wifi_calling_settings.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The Android Open Source 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.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

                  android:key="wifi_calling_settings"

                  android:title="@string/wifi_calling_settings_title">



    <ListPreference

            android:key="wifi_calling_mode"

            android:title="@string/wifi_calling_mode_title"

            android:summary="@string/wifi_calling_mode_title"

            android:entries="@array/wifi_calling_mode_choices"

            android:entryValues="@array/wifi_calling_mode_values"

            android:dialogTitle="@string/wifi_calling_mode_dialog_title" />



    <SwitchPreference

            android:key="wifi_calling_roam"

            android:title="@string/wifi_calling_roam_title"

            android:persistent="false"/>



</PreferenceScreen>

res/xml/wireless_settings.xml

+5 −0
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ 
            android:targetClass="com.android.phone.MobileNetworkSettings" />

    </PreferenceScreen>



    <PreferenceScreen

        android:key="wifi_calling_settings"

        android:title="@string/wifi_calling_settings_title"

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



    <Preference

        android:key="manage_mobile_plan"

        android:title="@string/manage_mobile_plan_title"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -101,5 +101,6 @@ public class Settings extends SettingsActivity { 


    public static class TopLevelSettings extends SettingsActivity { /* empty */ }

    public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }

    public static class WifiCallingSettingsActivity extends SettingsActivity { /* empty */ }

}