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

Commit fede1828 authored by kaiyiz's avatar kaiyiz Committed by Steve Kondik
Browse files

Settings: Add preference header to make the RoamingSettings. 

Add preference header to make the RoamingSettings.

CRs-fixed: 525245

Change-Id: I3fe4edd3d76ce09b0b85aebc9228ea9bad6ec9b7
parent f0f1f412

res/drawable-mdpi/ic_roaming_settings.png

0 → 100644
+3.21 KiB
Loading image diff...

res/values-zh-rCN/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1901,4 +1901,6 @@ 
    <string name="user_image_take_photo" msgid="1280274310152803669">"拍照"</string>

    <string name="user_image_choose_photo" msgid="7940990613897477057">"从图库中选择照片"</string>

    <string name="regulatory_info_text" msgid="5623087902354026557"></string>

    <!-- Roaming Date Settings -->

    <string name="label_global_roaming_settings">国际漫游设置</string>

</resources>

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -4621,4 +4621,6 @@ 


    <!-- Text to display in regulatory info screen (from device overlay). -->

    <string name="regulatory_info_text"></string>

    <!-- Roaming Date Settings -->

    <string name="label_global_roaming_settings">Global roaming settings</string>

</resources>

res/xml/settings_headers.xml

+8 −0
Original line number Diff line number Diff line
@@ -108,6 +108,14 @@ 
            android:targetClass="com.android.settings.MultiSimSettings" />

    </header>



    <!-- Global roaming settings - if RoamingSettings installed. -->

    <header

        android:id="@+id/global_roaming_settings"

        android:icon="@drawable/ic_roaming_settings"

        android:title="@string/label_global_roaming_settings">

        <intent android:action="com.android.action.roamingsettings"/>

    </header>



    <!-- Sound -->

    <header

        android:id="@+id/sound_settings"

src/com/android/settings/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.os.Bundle; 
import android.os.INetworkManagementService;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.preference.Preference;
@@ -94,6 +95,8 @@ public class Settings extends PreferenceActivity 
    private static final String META_DATA_KEY_PARENT_FRAGMENT_CLASS =

        "com.android.settings.PARENT_FRAGMENT_CLASS";



    private static final String GLOBAL_PROP = "persist.env.phone.global";



    private static final String EXTRA_UI_OPTIONS = "settings:ui_options";



    private static final String SAVE_KEY_CURRENT_HEADER = "com.android.settings.CURRENT_HEADER";
@@ -522,6 +525,10 @@ public class Settings extends PreferenceActivity 
            } else if (id == R.id.multi_sim_settings) {

                if (!MSimTelephonyManager.getDefault().isMultiSimEnabled())

                    target.remove(header);

            } else if (id == R.id.global_roaming_settings) {

                if (!SystemProperties.getBoolean(GLOBAL_PROP, false)) {

                    target.remove(header);

                }

            }



            if (i < target.size() && target.get(i) == header