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

Commit 491ae1a4 authored by Joey Rizzoli's avatar Joey Rizzoli Committed by Steve Kondik
Browse files

Settings: cm-ify wireless settings screen 



* Move nfc to its category
* Disable useless mobile plan pref

Change-Id: I9d3b09afb445e0f357bf5910ed85476272976f56
Signed-off-by: default avatarJoey Rizzoli <joey@cyanogenmoditalia.it>
parent 7939cca3

AndroidManifest.xml

+1 −3
Original line number Diff line number Diff line
@@ -2570,8 +2570,6 @@ 
            <intent-filter android:priority="1">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

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

                android:value="com.android.settings.category.device" />

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

                android:value="com.android.settings.nfc.PaymentSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2592,7 +2590,7 @@ 


        <activity android:name=".nfc.HowItWorks"

                  android:label="@string/nfc_payment_settings_title"

                  android:parentActivityName="Settings$PaymentSettingsActivity">

                  android:parentActivityName="Settings$PaymentSettingsActivity"

                  android:excludeFromRecents="true">

        </activity>

res/values/bools.xml

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
    <bool name="config_show_regulatory_info">false</bool>



    <!-- Whether to show a preference item for mobile plan -->

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

    <bool name="config_show_mobile_plan">false</bool>



    <!-- Whether to add AGPS parameter settings -->

    <bool name="config_agps_enabled">false</bool>

res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -358,4 +358,7 @@ 
    <string name="sim_card_summary_empty">SIM not inserted</string>

    <string name="sim_mobile_network_settings_category_title">Mobile network settings</string>

    <string name="sim_mobile_network_settings_title">SIM %d settings</string>



    <!-- NFC PreferenceCategory title -->

    <string name="nfc_title_category">NFC</string>

</resources>

res/xml/wireless_settings.xml

+21 −12
Original line number Diff line number Diff line
@@ -23,22 +23,12 @@ 
        android:title="@string/airplane_mode"

        android:disableDependentsState="true" />



    <SwitchPreference

        android:key="toggle_nfc"

        android:title="@string/nfc_quick_toggle_title"

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



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



    <com.android.settingslib.RestrictedPreference

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

        android:key="android_beam_settings"

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



    <com.android.settingslib.RestrictedPreference

        android:fragment="com.android.settings.TetherSettings"

        android:key="tether_settings"
@@ -98,4 +88,23 @@ 
        settings:useAdminDisabledSummary="true"

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



    <PreferenceCategory

        android:key="nfc_category_settings"

        android:title="@string/nfc_title_category" >



        <SwitchPreference

            android:key="toggle_nfc"

            android:title="@string/nfc_quick_toggle_title"

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



        <com.android.settingslib.RestrictedPreference

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

            android:key="android_beam_settings"

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



        <PreferenceScreen

            android:key="nfc_payment_settings"

            android:title="@string/nfc_payment_settings_title"

            android:fragment="com.android.settings.nfc.PaymentSettings" />

    </PreferenceCategory>

</PreferenceScreen>