summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authortk.mun <tk.mun@samsung.com>2011-10-13 22:56:18 +0900
committerRobert Greenwalt <rgreenwalt@google.com>2011-11-07 17:16:18 -0800
commit7c5c16565eccde0b98f7ad08a0f06ff51e8e90ce (patch)
tree322b51b49d54cb6d0e02c9fb0ebc205eb393763c /res
parent815c7a042d58a3e21f71603bfb972a31a79addca (diff)
downloadpackages_apps_Settings-7c5c16565eccde0b98f7ad08a0f06ff51e8e90ce.tar.gz
packages_apps_Settings-7c5c16565eccde0b98f7ad08a0f06ff51e8e90ce.tar.bz2
packages_apps_Settings-7c5c16565eccde0b98f7ad08a0f06ff51e8e90ce.zip
Wimax : 4G settings menu and 4G MAC address.
1. Show the 4G menu. 2. Show the 4G MAC address 3. Execute 4G setting apk. Change-Id: I14adc4775d35afe3398ddba4fd91c739011a06fa Signed-off-by: tk.mun <tk.mun@samsung.com> bug:5486930
Diffstat (limited to 'res')
-rw-r--r--res/values/bools.xml3
-rwxr-xr-xres/values/config.xml3
-rw-r--r--res/values/strings.xml8
-rw-r--r--res/xml/device_info_status.xml6
-rw-r--r--res/xml/wireless_settings.xml10
5 files changed, 29 insertions, 1 deletions
diff --git a/res/values/bools.xml b/res/values/bools.xml
index a7e6ac834..278859bab 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -22,4 +22,7 @@
<!-- Whether the power control widget is enabled for this device. Should be overridden for
specific product builds. -->
<bool name="has_powercontrol_widget">true</bool>
+
+ <!-- Display additional System Update menu if true -->
+ <bool name="config_additional_system_update_setting_enable">false</bool>
</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 4b08c4283..4119b6a06 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -19,4 +19,7 @@
<!-- If false, MIN is displayed. If true, MSID is displayed. -->
<bool name="config_msid_enable" translatable="false">false</bool>
+ <string name="additional_system_update" translatable="false"></string>
+ <string name="additional_system_update_menu" translatable="false"></string>
+
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f9e9c8962..2ed1f1344 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3431,6 +3431,9 @@ found in the list of installed apps.</string>
<!-- Messaage shown in dialog when you can't manually sync -->
<string name="cant_sync_dialog_message">Sync for this item is currently disabled. To change this setting, temporarily turn on background data and automatic sync.</string>
+ <string name="wimax_settings">4G settings</string>
+ <string name="wimax_settings_summary">Set up &amp; manage 4G network and modem</string>
+ <string name="status_wimax_mac_address">4G MAC address</string>
<!-- This is displayed to the user when the device needs to be decrypted -->
<string name="enter_password">Type password to decrypt storage</string>
<!-- This is displayed when the password is entered incorrectly -->
@@ -3764,4 +3767,9 @@ found in the list of installed apps.</string>
<!-- Representation of a numerical percentage. [CHAR LIMIT=8] -->
<string name="percentage"><xliff:g id="number" example="30">%d</xliff:g>%%</string>
+ <!-- A menu item in "About phone" that allows the user to update the phone with settings
+ from their cell phone carrier. The use of the string is similar to the string
+ "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
+ <string name="additional_system_update_settings_list_item_title">Additional system updates</string>
+
</resources>
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index 19e22f438..aaa90a920 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -120,5 +120,9 @@
android:title="@string/status_up_time"
android:summary="@string/device_info_not_available"
android:persistent="false" />
-
+ <Preference android:key="wimax_mac_address"
+ style="?android:attr/preferenceInformationStyle"
+ android:title="@string/status_wimax_mac_address"
+ android:summary="@string/device_info_not_available"
+ android:persistent="false" />
</PreferenceScreen>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 134461dec..20ffd8eb7 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -33,6 +33,16 @@
android:key="tether_settings"
android:title="@string/tether_settings_title_all" />
+ <PreferenceScreen
+ android:key="wimax_settings"
+ android:title="@string/wimax_settings"
+ android:summary="@string/wimax_settings_summary" >
+ <intent
+ android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.settings.wimax"
+ android:targetClass="com.android.settings.wimax.WimaxSettings" />
+ </PreferenceScreen>
+
<CheckBoxPreference
android:key="toggle_nfc"
android:title="@string/nfc_quick_toggle_title"