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

Commit 3d299959 authored by Shaoxu Liu's avatar Shaoxu Liu
Browse files

Customize regulatory info. 

Since the AndroidManifest could not use the overlay boolean,
enable the regulatory info in AndroidManifest.
Add flag checking to make sure it could be customized to enable
or disable.

Change-Id: I95018d94dea271eed9d740b356ad883c0b537e28
parent 584a7b64

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2423,7 +2423,7 @@ 
        <activity android:name="RegulatoryInfoDisplayActivity"

                  android:label="@string/regulatory_information"

                  android:taskAffinity=""

                  android:enabled="@bool/config_show_regulatory_info">

                  android:enabled="true">

            <intent-filter>

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

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

src/com/android/settings/DeviceInfoSettings.java

+3 −2
Original line number Diff line number Diff line
@@ -180,9 +180,10 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
        removePreferenceIfBoolFalse(KEY_UPDATE_SETTING,

                R.bool.config_additional_system_update_setting_enable);



        // Remove regulatory information if none present.

        // Remove regulatory information if none present or config_show_regulatory_info is disabled

        final Intent intent = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO);

        if (getPackageManager().queryIntentActivities(intent, 0).isEmpty()) {

        if (getPackageManager().queryIntentActivities(intent, 0).isEmpty()

                || !getResources().getBoolean(R.bool.config_show_regulatory_info)) {

            Preference pref = findPreference(KEY_REGULATORY_INFO);

            if (pref != null) {

                getPreferenceScreen().removePreference(pref);