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

Commit dd2908d5 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge changes I3008bf85,I43aebf2e,I4fda0708,I744d5376 

* changes:
  Remove AdvancedOptionsPreference
  Add activity for mobile network page
  Fix the complie error of network migration
  Copy MobileNetworkSettings to settings app
parents 95d28227 2c0861e6

AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -131,6 +131,13 @@ 
                  android:launchMode="singleTask">

        </activity>



        <activity android:name=".mobilenetwork.MobileSettingsActivity"

                  android:label="@string/network_settings_title"

                  android:theme="@style/Theme.Settings.Home"

                  android:launchMode="singleTask">

            <!-- TODO(b/114749736): add intent filter here and disable the one in telephony -->

        </activity>



        <!-- Alias for launcher activity only, as this belongs to each profile. -->

        <activity-alias android:name="Settings"

                android:taskAffinity="com.android.settings.root"

res/layout/mobile_settings_container.xml

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

<!--

  Copyright (C) 2018 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.

  -->



<LinearLayout

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

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <Toolbar

        android:id="@+id/action_bar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:navigationContentDescription="@*android:string/action_bar_up_description"

        android:theme="?android:attr/actionBarTheme"

        style="?android:attr/actionBarStyle"/>



    <FrameLayout

        android:id="@+id/main_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"/>



    <com.google.android.material.bottomnavigation.BottomNavigationView

        android:id="@+id/bottom_nav"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:layout_marginEnd="0dp"

        android:layout_marginStart="0dp"

        android:background="?android:attr/windowBackground"

        app:itemIconTint="@color/bottom_navigation_colors"

        app:itemTextColor="@color/bottom_navigation_colors"

        app:menu="@menu/home_bottom_navigation"/>

</LinearLayout>

res/values/arrays.xml

+182 −0
Original line number Diff line number Diff line
@@ -1133,4 +1133,186 @@ 
        <item>4</item> <!-- AutofillManager.FLAG_ADD_CLIENT_VERBOSE -->

    </string-array>



    <string-array name="enabled_networks_choices" translatable="false">

        <item>@string/network_lte</item>

        <item>@string/network_3G</item>

        <item>@string/network_2G</item>

    </string-array>

    <string-array name="enabled_networks_4g_choices" translatable="false">

        <item>@string/network_4G</item>

        <item>@string/network_3G</item>

        <item>@string/network_2G</item>

    </string-array>

    <string-array name="enabled_networks_values" translatable="false">

        <item>"9"</item>

        <item>"0"</item>

        <item>"1"</item>

    </string-array>



    <string-array name="cdma_system_select_choices">

        <!-- System select dialog screen, setting option name -->

        <item>Home only</item>

        <!-- Remove the following option "Affiliated Networks" from the option list -->

        <!-- <item>Affiliated Networks</item> -->

        <!-- System select dialog screen, setting option name -->

        <item>Automatic</item>

    </string-array>

    <string-array name="cdma_system_select_values" translatable="false">

        <!-- Do not translate. -->

        <item>"0"</item>

        <!-- Remove the following value "1" which corresponds to "Affiliated Networks" above -->

        <!-- <item>"1"</item>  -->

        <!-- Do not translate. -->

        <item>"2"</item>

    </string-array>



    <!-- The preferred network modes in Mobile network settings -->

    <string-array name="preferred_network_mode_choices">

        <item>GSM/WCDMA preferred</item>

        <item>GSM only</item>

        <item>WCDMA only</item>

        <item>GSM/WCDMA auto</item>

        <item>CDMA/EvDo auto</item>

        <item>CDMA w/o EvDo</item>

        <item>EvDo only</item>

        <item>CDMA/EvDo/GSM/WCDMA</item>

        <item>CDMA + LTE/EvDo</item>

        <item>GSM/WCDMA/LTE</item>

        <item>Global</item>

        <item>LTE</item>

        <item>LTE / WCDMA</item>

        <item>TDSCDMA only</item>

        <item>TDSCDMA/WCDMA</item>

        <item>LTE/TDSCDMA</item>

        <item>TDSCDMA/GSM</item>

        <item>LTE/TDSCDMA/GSM</item>

        <item>TDSCDMA/GSM/WCDMA</item>

        <item>LTE/TDSCDMA/WCDMA</item>

        <item>LTE/TDSCDMA/GSM/WCDMA</item>

        <item>TDSCDMA/CDMA/EVDO/GSM/WCDMA </item>

        <item>LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA</item>

    </string-array>

    <!-- The preferred network modes RIL constants, in order of the modes above,

         e.g. the choice "GSM/WCDMA preferred" has the corresponding value "0" -->

    <string-array name="preferred_network_mode_values"  translatable="false">

        <item>"0"</item>

        <item>"1"</item>

        <item>"2"</item>

        <item>"3"</item>

        <item>"4"</item>

        <item>"5"</item>

        <item>"6"</item>

        <item>"7"</item>

        <item>"8"</item>

        <item>"9"</item>

        <item>"10"</item>

        <item>"11"</item>

        <item>"12"</item>

        <item>"13"</item>

        <item>"14"</item>

        <item>"15"</item>

        <item>"16"</item>

        <item>"17"</item>

        <item>"18"</item>

        <item>"19"</item>

        <item>"20"</item>

        <item>"21"</item>

        <item>"22"</item>

    </string-array>



    <!-- Choices for CDMA subscription-->

    <string-array name="cdma_subscription_choices">

        <item>RUIM/SIM</item>

        <item>NV</item>

    </string-array>

    <!-- Values for CDMA subscription-->

    <string-array name="cdma_subscription_values">

        <item>"0"</item>

        <item>"1"</item>

    </string-array>



    <string-array name="enabled_networks_except_gsm_choices" translatable="false">

        <item>@string/network_lte</item>

        <item>@string/network_3G</item>

    </string-array>

    <string-array name="enabled_networks_except_gsm_4g_choices" translatable="false">

        <item>@string/network_4G</item>

        <item>@string/network_3G</item>

    </string-array>

    <string-array name="enabled_networks_except_gsm_values" translatable="false">

        <item>"9"</item>

        <item>"0"</item>

    </string-array>



    <string-array name="enabled_networks_except_lte_choices" translatable="false">

        <item>@string/network_3G</item>

        <item>@string/network_2G</item>

    </string-array>

    <string-array name="enabled_networks_except_lte_values" translatable="false">

        <item>"0"</item>

        <item>"1"</item>

    </string-array>



    <string-array name="enabled_networks_except_gsm_lte_choices" translatable="false">

        <item>@string/network_3G</item>

    </string-array>

    <string-array name="enabled_networks_except_gsm_lte_values" translatable="false">

        <item>"0"</item>

    </string-array>



    <string-array name="enabled_networks_cdma_choices" translatable="false">

        <item>@string/network_lte</item>

        <item>@string/network_3G</item>

        <item>@string/network_1x</item>

        <item>@string/network_global</item>

    </string-array>

    <string-array name="enabled_networks_cdma_values" translatable="false">

        <item>"8"</item>

        <item>"4"</item>

        <item>"5"</item>

        <item>"10"</item>

    </string-array>



    <string-array name="enabled_networks_cdma_no_lte_choices" translatable="false">

        <item>@string/network_3G</item>

        <item>@string/network_1x</item>

    </string-array>

    <string-array name="enabled_networks_cdma_no_lte_values" translatable="false">

        <item>"4"</item>

        <item>"5"</item>

    </string-array>



    <string-array name="enabled_networks_cdma_only_lte_choices" translatable="false">

        <item>@string/network_lte</item>

        <item>@string/network_global</item>

    </string-array>

    <string-array name="enabled_networks_cdma_only_lte_values" translatable="false">

        <item>"8"</item>

        <item>"10"</item>

    </string-array>



    <string-array name="enabled_networks_tdscdma_choices" translatable="false">

        <item>@string/network_lte</item>

        <item>@string/network_3G</item>

        <item>@string/network_2G</item>

    </string-array>

    <string-array name="enabled_networks_tdscdma_values" translatable="false">

        <item>"22"</item>

        <item>"18"</item>

        <item>"1"</item>

    </string-array>



    <!--String arrays for World preferred netwrok modes -->

    <string-array name="preferred_network_mode_choices_world_mode">

        <item>Global</item>

        <item>LTE / CDMA</item>

        <item>LTE / GSM / UMTS</item>

    </string-array>



    <string-array name="preferred_network_mode_values_world_mode">

        <item>"10"</item>

        <item>"8"</item>

        <item>"9"</item>

    </string-array>



</resources>

res/values/config.xml

+9 −0
Original line number Diff line number Diff line
@@ -136,4 +136,13 @@ 


    <!-- Whether or not TopLevelSettings should force rounded icon for injected tiles -->

    <bool name="config_force_rounded_icon_TopLevelSettings">true</bool>



    <!-- TODO(b/115429501): move those 3 configs to framework-->

    <!-- Show enabled lte option for lte device -->

    <bool name="config_enabled_lte" translatable="false">false</bool>

    <!-- Show enabled tdscdma option for device -->

    <bool name="config_support_tdscdma" translatable="false">false</bool>

    <!-- Show enabled tdscdma option for device when connect roaming network -->

    <string-array name="config_support_tdscdma_roaming_on_networks"

                  translatable="false"></string-array>

</resources>

res/values/strings.xml

+142 −0
Original line number Diff line number Diff line
@@ -10115,4 +10115,146 @@ 








    <!-- Message informs the user that has no SIM card in personalized Settings [CHAR LIMIT=30] -->









    <string name="no_sim_card">No SIM card</string>

















    <!-- Carrier variant of Enhaced 4G LTE Mode title.  [CHAR LIMIT=50] -->









    <string name="enhanced_4g_lte_mode_title_variant">Advanced Calling</string>









    <!-- The following strings are summaries for preferred network modes in Mobile network settings,









     and have a character limit of 100 -->









    <!-- WCDMA preferred [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_wcdma_perf_summary">Preferred network mode: WCDMA preferred</string>









    <!-- GSM only [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_gsm_only_summary">Preferred network mode: GSM only</string>









    <!-- WCDMA only [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_wcdma_only_summary">Preferred network mode: WCDMA only</string>









    <!-- GSM / WCDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_gsm_wcdma_summary">Preferred network mode: GSM / WCDMA</string>









    <!-- CDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_cdma_summary">Preferred network mode: CDMA</string>









    <!-- CDMA / EvDo [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_cdma_evdo_summary">Preferred network mode: CDMA / EvDo</string>









    <!-- CDMA only [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_cdma_only_summary">Preferred network mode: CDMA only</string>









    <!-- EvDo only [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_evdo_only_summary">Preferred network mode: EvDo only</string>









    <!-- CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary">Preferred network mode: CDMA/EvDo/GSM/WCDMA</string>









    <!-- LTE [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_lte_summary">Preferred network mode: LTE </string>









    <!-- GSM/WCDMA/LTE [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_lte_gsm_wcdma_summary">Preferred network mode: GSM/WCDMA/LTE</string>









    <!-- CDMA+LTE/EVDO [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_lte_cdma_evdo_summary">Preferred network mode: CDMA+LTE/EVDO</string>









    <!-- Global [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_global_summary">Preferred network mode: Global</string>









    <!-- LTE / WCDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_lte_wcdma_summary">Preferred network mode: LTE / WCDMA</string>









    <!-- LTE / GSM / UMTS [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_lte_gsm_umts_summary">Preferred network mode: LTE / GSM / UMTS</string>









    <!-- LTE / CDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_lte_cdma_summary">Preferred network mode: LTE / CDMA</string>









    <!-- TDSCDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_tdscdma_summary">Preferred network mode: TDSCDMA</string>









    <!-- TDSCDMA / WCDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_tdscdma_wcdma_summary">Preferred network mode: TDSCDMA / WCDMA</string>









    <!-- LTE / TDSCDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_lte_tdscdma_summary">Preferred network mode: LTE / TDSCDMA</string>









    <!-- TDSCDMA / GSM [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_tdscdma_gsm_summary">Preferred network mode: TDSCDMA / GSM</string>









    <!-- LTE/GSM/TDSCDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_lte_tdscdma_gsm_summary">Preferred network mode: LTE/GSM/TDSCDMA</string>









    <!-- TDSCDMA/GSM/WCDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary">Preferred network mode: TDSCDMA/GSM/WCDMA</string>









    <!-- LTE/TDSCDMA/WCDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_lte_tdscdma_wcdma_summary">Preferred network mode: LTE/TDSCDMA/WCDMA</string>









    <!-- LTE/TDSCDMA/GSM/WCDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary">Preferred network mode: LTE/TDSCDMA/GSM/WCDMA</string>









    <!-- TDSCDMA/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary">Preferred network mode: TDSCDMA/CDMA/EvDo/GSM/WCDMA</string>









    <!-- LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary">Preferred network mode: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</string>

















    <!-- Text for Network lte [CHAR LIMIT=NONE] -->









    <string name="network_lte">LTE (recommended)</string>









    <!-- Text for Network 4g [CHAR LIMIT=NONE] -->









    <string name="network_4G">4G (recommended)</string>









    <!-- Text for Network 3g [CHAR LIMIT=NONE] -->









    <string name="network_3G" translatable="false">3G</string>









    <!-- Text for Network 2g [CHAR LIMIT=NONE] -->









    <string name="network_2G" translatable="false">2G</string>









    <!-- Text for Network 1x [CHAR LIMIT=NONE] -->









    <string name="network_1x" translatable="false">1x</string>









    <!-- Text for Network global [CHAR LIMIT=NONE] -->









    <string name="network_global">Global</string>

















    <!-- Configuration setting for world mode Format is <true;GID if any to be checked> [CHAR LIMIT=NONE] -->









    <string translatable="false" name="config_world_mode"/>

















    <!-- Available networks screen title/heading [CHAR LIMIT=NONE] -->









    <string name="label_available">Available networks</string>









    <!-- Mobile network settings screen, toast when searching for available networks [CHAR LIMIT=NONE] -->









    <string name="load_networks_progress">Searching\u2026</string>









    <!-- Available networks screen, toast when registering on a specific network [CHAR LIMIT=NONE] -->









    <string name="register_on_network">Registering on <xliff:g id="network" example="Verizon">%s</xliff:g>\u2026</string>









    <!-- Available networks screen, toast when SIM card isn't allowed on a network [CHAR LIMIT=NONE] -->









    <string name="not_allowed">Your SIM card doesn\u2019t allow a connection to this network.</string>









    <!-- Available networks screen, toast when unable to connect to a network temporarily [CHAR LIMIT=NONE] -->









    <string name="connect_later">Can\u2019t connect to this network right now. Try again later.</string>









    <!-- Available networks screen, toast when registered on a specific network [CHAR LIMIT=NONE] -->









    <string name="registration_done">Registered on network.</string>

















    <!-- Available networks screen, name of switch button for whether to select network automatically [CHAR LIMIT=NONE] -->









    <string name="select_automatically">Automatically select network</string>

















    <!-- A menu item in "Mobile network settings" that allows the user to update the phone









     with mobile operator specific settings. [CHAR LIMIT=25] -->









    <string name="carrier_settings_title">Carrier settings</string>









    <!-- Preference title for launching an account manager page for prepaid LTE [CHAR LIMIT=30] -->









    <string name="cdma_lte_data_service">Set up data service</string>









    <!-- Mobile network settings screen, title of Mobile Data switch preference [CHAR LIMIT=NONE] -->









    <string name="mobile_data_settings_title">Mobile data</string>









    <!-- Mobile network settings screen, title of Mobile data switch preference [CHAR LIMIT=NONE] -->









    <string name="mobile_data_settings_summary">Access data using mobile network</string>

















    <!-- Title for preferred network type [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_title">Preferred network type</string>









    <!-- Summary for preferred network type [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_summary">Change the network operating mode</string>









    <!-- Dialog title for preferred network type [CHAR LIMIT=NONE] -->









    <string name="preferred_network_mode_dialogtitle">Preferred network type</string>









    <!-- Mobile network settings screen, name of the option to manage carrier profiles on devices which support embedded carrier profiles [CHAR LIMIT=NONE] -->









    <string name="carrier_settings_euicc">Carrier</string>

















    <!-- Mobile network settings screen, name for call settings category [CHAR LIMIT=NONE] -->









    <string name="call_category">Calling</string>









    <!-- Mobile network settings screen, title of Video calling setting [CHAR LIMIT=NONE] -->









    <string name="video_calling_settings_title">Carrier video calling</string>

















    <!-- Mobile network settings screen, setting option name [CHAR LIMIT=NONE] -->









    <string name="cdma_system_select_title">System select</string>









    <!-- Mobile network settings screen, setting summary text [CHAR LIMIT=NONE] -->









    <string name="cdma_system_select_summary">Change the CDMA roaming mode</string>









    <!-- System select settings screen title [CHAR LIMIT=NONE] -->









    <string name="cdma_system_select_dialogtitle">System select</string>

















    <!-- Mobile network settings screen, name for network operator category [CHAR LIMIT=NONE] -->









    <string name="network_operator_category">Network</string>









    <!-- Available networks screen, name of button when user wants to select network manually [CHAR LIMIT=NONE] -->









    <string name="network_select_title">Network</string>

















    <!-- Title for CDMA subscription [CHAR LIMIT=50] -->









    <string name="cdma_subscription_title">CDMA subscription</string>









    <!-- Summary for CDMA subscription [CHAR LIMIT=NONE] -->









    <string name="cdma_subscription_summary">Change between RUIM/SIM and NV</string>









    <!-- Dialog title for CDMA subscription [CHAR LIMIT=30] -->









    <string name="cdma_subscription_dialogtitle">subscription</string>

















    <!-- Title to register automatically [CHAR LIMIT=NONE] -->









    <string name="register_automatically">Automatic registration\u2026</string>









    <!-- Mobile network settings screen, dialog message title when user selects the Data roaming check box [CHAR LIMIT=120] -->









    <string name="roaming_alert_title">Allow data roaming?</string>









    <!-- Mobile network settings screen, message asking the user to check their pricing with their Carrier, when enabling Data roaming. [CHAR LIMIT=NONE] -->









    <string name="roaming_check_price_warning">Check with your network provider for pricing.</string>

















    <!-- Available networks screen, summary when button disallowed due to permanent automatic mode [CHAR LIMIT=NONE] -->









    <string name="manual_mode_disallowed_summary">Unavailable when connected to <xliff:g id="carrier" example="verizon">%1$s</xliff:g></string>









</resources>