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

Commit f59dd9d6 authored by Jake Hamby's avatar Jake Hamby Committed by Android (Google) Code Review
Browse files

Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev

parents 40b78280 ef57ed71

res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -4099,4 +4099,9 @@ 
    <string name="help_url_backup_reset" translatable="false"></string>

    <!-- Help URL, Tethering [DO NOT TRANSLATE] -->

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



    <!-- Cell Broadcast settings title [CHAR LIMIT=50] -->

    <string name="cell_broadcast_settings">Cell broadcasts</string>

    <!-- Cell Broadcast settings description [CHAR LIMIT=100] -->

    <string name="cell_broadcast_settings_summary">Select the types of emergency alerts to display.</string>

</resources>

res/xml/wireless_settings.xml

+10 −0
Original line number Diff line number Diff line
@@ -75,4 +75,14 @@ 
        android:key="proxy_settings"

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



    <PreferenceScreen

        android:key="cell_broadcast_settings"

        android:title="@string/cell_broadcast_settings"

        android:summary="@string/cell_broadcast_settings_summary" >

        <intent

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

            android:targetPackage="com.android.cellbroadcastreceiver"

            android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />

    </PreferenceScreen>



</PreferenceScreen>

src/com/android/settings/WirelessSettings.java

+21 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ public class WirelessSettings extends SettingsPreferenceFragment { 
    private static final String KEY_PROXY_SETTINGS = "proxy_settings";

    private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";

    private static final String KEY_TOGGLE_NSD = "toggle_nsd"; //network service discovery

    private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";



    public static final String EXIT_ECM_RESULT = "exit_ecm_result";

    public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -171,6 +172,26 @@ public class WirelessSettings extends SettingsPreferenceFragment { 
            Preference p = findPreference(KEY_TETHER_SETTINGS);

            p.setTitle(Utils.getTetheringLabel(cm));

        }



        // Enable link to CMAS app settings depending on the value in config.xml.

        boolean isCellBroadcastAppLinkEnabled = this.getResources().getBoolean(

                com.android.internal.R.bool.config_cellBroadcastAppLinks);

        try {

            if (isCellBroadcastAppLinkEnabled) {

                PackageManager pm = getPackageManager();

                if (pm.getApplicationEnabledSetting("com.android.cellbroadcastreceiver")

                        == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {

                    isCellBroadcastAppLinkEnabled = false;  // CMAS app disabled

                }

            }

        } catch (IllegalArgumentException ignored) {

            isCellBroadcastAppLinkEnabled = false;  // CMAS app not installed

        }

        if (!isCellBroadcastAppLinkEnabled) {

            PreferenceScreen root = getPreferenceScreen();

            Preference ps = findPreference(KEY_CELL_BROADCAST_SETTINGS);

            if (ps != null) root.removePreference(ps);

        }

    }



    @Override