PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jake Hamby
2012-06-25 16:19:23 -07:00
committed by Android (Google) Code Review
parent 40b78280eb ef57ed71bf
commit f59dd9d67e
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -4099,4 +4099,9 @@
<string name="help_url_backup_reset" translatable="false"></string> <string name="help_url_backup_reset" translatable="false"></string>
<!-- Help URL, Tethering [DO NOT TRANSLATE] --> <!-- Help URL, Tethering [DO NOT TRANSLATE] -->
<string name="help_url_tether" translatable="false"></string> <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> </resources>

10
res/xml/wireless_settings.xml
View File

@@ -75,4 +75,14 @@
android:key="proxy_settings" android:key="proxy_settings"
android:title="@string/proxy_settings_title" /> 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> </PreferenceScreen>

21
src/com/android/settings/WirelessSettings.java
View File

@@ -50,6 +50,7 @@ public class WirelessSettings extends SettingsPreferenceFragment {
private static final String KEY_PROXY_SETTINGS = "proxy_settings"; 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_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
private static final String KEY_TOGGLE_NSD = "toggle_nsd"; //network service discovery 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 String EXIT_ECM_RESULT = "exit_ecm_result";
public static final int REQUEST_CODE_EXIT_ECM = 1; public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -171,6 +172,26 @@ public class WirelessSettings extends SettingsPreferenceFragment {
Preference p = findPreference(KEY_TETHER_SETTINGS); Preference p = findPreference(KEY_TETHER_SETTINGS);
p.setTitle(Utils.getTetheringLabel(cm)); 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 @Override