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

Commit 38f872fa authored by jackqdyulei's avatar jackqdyulei
Browse files

Fix the complie error of network migration 

1. Fix the error in import part
2. Remove broken code and add TODO

Future CL will fix TODO and add tests

Bug: 114749736
Test: Build
Change-Id: I4fda0708959e299015ecb10ac17c9c2dadc6f852
parent bff33e17

res/values/config.xml

+6 −1
Original line number Diff line number Diff line
@@ -137,7 +137,12 @@ 
    <!-- Whether or not TopLevelSettings should force rounded icon for injected tiles -->

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



    <!-- TODO(b/114749736): migrate override for config value -->

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

+12 −15
Original line number Diff line number Diff line
@@ -10186,23 +10186,10 @@ 
    <!-- 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, text when no networks connected [CHAR LIMIT=NONE] -->









    <string name="network_disconnected">Disconnected</string>









    <!-- Available networks screen, text when network connected [CHAR LIMIT=NONE] -->









    <string name="network_connected">Connected</string>









    <!-- Available networks screen, text when a network is connecting [CHAR LIMIT=NONE] -->









    <string name="network_connecting">Connecting\u2026</string>









    <!-- Available networks screen, text when a network cannot be connected [CHAR LIMIT=NONE] -->









    <string name="network_could_not_connect">Couldn’t connect</string>

















    <!-- 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, text when no networks are found [CHAR LIMIT=NONE] -->









    <string name="empty_networks_list">No networks found.</string>









    <!-- Available networks screen, toast when an error is encountered when searching for networks [CHAR LIMIT=NONE] -->









    <string name="network_query_error">Couldn\u2019t find networks. Try again.</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] -->








@@ -10215,8 +10202,6 @@







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









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

















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









    <string name="choose_network_title">Choose 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>








@@ -10259,4 +10244,16 @@







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

















    <!-- Mobile network settings screen, Advanced button to show more items when clicked [CHAR LIMIT=50] -->









    <string name="advanced_options_title">Advanced</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>

























res/xml/cdma_options.xml



+15
−16






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!-- Copyright (C) 2008 The Android Open Source Project









<!--









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








@@ -16,7 +17,7 @@

















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



















    <com.android.phone.CdmaSystemSelectListPreference









    <com.android.settings.mobilenetwork.CdmaSystemSelectListPreference









        android:key="cdma_system_select_key"









        android:title="@string/cdma_system_select_title"









        android:summary="@string/cdma_system_select_summary"








@@ -24,7 +25,7 @@







        android:entryValues="@array/cdma_system_select_values"









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



















    <com.android.phone.CdmaSubscriptionListPreference









    <com.android.settings.mobilenetwork.CdmaSubscriptionListPreference









        android:key="cdma_subscription_key"









        android:title="@string/cdma_subscription_title"









        android:summary="@string/cdma_subscription_summary"








@@ -37,7 +38,7 @@







    <PreferenceCategory









        android:key="category_cdma_apn_key">









        <!-- The launching Intent will be defined thru code as we need to pass some Extra -->









        <com.android.phone.RestrictedPreference









        <com.android.settingslib.RestrictedPreference









            android:key="button_cdma_apn_key"









            android:title="@string/apn_settings"









            android:persistent="false"/>








@@ -46,9 +47,7 @@







    <Preference









        android:key="carrier_settings_key"









        android:title="@string/carrier_settings_title">









        <intent android:action="android.intent.action.MAIN"









                android:targetPackage="@string/carrier_settings"









                android:targetClass="@string/carrier_settings_menu" />









        <!-- b/114749736, create a preference controller to build intent -->









    </Preference>



















</PreferenceScreen>
























res/xml/gsm_umts_options.xml



+16
−17






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!-- Copyright (C) 2008 The Android Open Source Project









<!--









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








@@ -16,7 +17,7 @@

















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



















    <com.android.phone.NetworkOperators









    <com.android.settings.mobilenetwork.NetworkOperators









        android:key="network_operators_category_key"









        android:title="@string/network_operator_category"









        android:persistent="false">








@@ -26,7 +27,7 @@







            android:title="@string/select_automatically"









            android:persistent="false"/>



















        <com.android.phone.NetworkSelectListPreference









        <com.android.settings.mobilenetwork.NetworkSelectListPreference









            android:key="button_network_select_key"









            android:title="@string/network_select_title"









            android:persistent="false"/>








@@ -35,7 +36,7 @@







            android:key="button_choose_network_key"









            android:title="@string/choose_network_title"









            android:fragment="com.android.phone.NetworkSelectSetting" />









    </com.android.phone.NetworkOperators>









    </com.android.settings.mobilenetwork.NetworkOperators>



















    <!--We want separate APN setting from reset of settings because-->









    <!--we want user to change it with caution.-->








@@ -43,7 +44,7 @@







        android:key="category_gsm_apn_key"









        android:layout="@layout/preference_category_no_label">



















        <com.android.phone.RestrictedPreference









        <com.android.settingslib.RestrictedPreference









            android:key="button_gsm_apn_key"









            android:title="@string/apn_settings"









            android:persistent="false" />








@@ -52,9 +53,7 @@







    <PreferenceScreen









        android:key="carrier_settings_key"









        android:title="@string/carrier_settings_title">









        <intent android:action="android.intent.action.MAIN"









                android:targetPackage="@string/carrier_settings"









                android:targetClass="@string/carrier_settings_menu" />









        <!-- b/114749736, create a preference controller to build intent -->









    </PreferenceScreen>



















</PreferenceScreen>
























res/xml/network_setting_fragment.xml



+4
−4






























Original line number
Diff line number
Diff line







@@ -20,23 +20,23 @@







        android:title="@string/cdma_lte_data_service">









    </PreferenceScreen>



















    <com.android.phone.MobileDataPreference









    <com.android.settings.mobilenetwork.MobileDataPreference









        android:key="mobile_data_enable"









        android:title="@string/mobile_data_settings_title"









        android:summary="@string/mobile_data_settings_summary"/>



















    <com.android.phone.RestrictedSwitchPreference









    <com.android.settingslib.RestrictedSwitchPreference









        android:key="button_roaming_key"









        android:title="@string/roaming"









        android:persistent="false"









        android:summaryOn="@string/roaming_enable"









        android:summaryOff="@string/roaming_disable"/>



















    <com.android.phone.DataUsagePreference









    <com.android.settings.mobilenetwork.DataUsagePreference









        android:key="data_usage_summary"









        android:title="@string/data_usage_title" />



















    <com.android.phone.AdvancedOptionsPreference









    <com.android.settings.mobilenetwork.AdvancedOptionsPreference









        android:key="advanced_options"/>



















    <SwitchPreference