Commit: 57216dc1d7f9ca79ffc4cbc4f9159e8f16b2c92b - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• Revisão: 57216dc1d7f9ca79ffc4cbc4f9159e8f16b2c92b (tree)
• Hora: 2009-09-05 04:21:06
• Autor: Yi Sun <beyounn@gmai...>
• Commiter: Chih-Wei Huang

Mensagem de Log

change the summary of ethernet checkbox

Mudança Sumário

• modified: res/values/strings.xml
• modified: res/xml/ethernet_settings.xml
• modified: src/com/android/settings/ethernet/EthernetEnabler.java

Diff

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2024,8 +2024,8 @@ found in the list of installed applications.</string>
 <string name="eth_dns">DNS address</string>
 <string name="eth_gw">Default Router</string>
 <string name="eth_ipaddr">IP address</string>
-<string name="eth_quick_toggle_title">Toggle Ethernet</string>
-<string name="eth_quick_toggle_summary">Toggle Ethernet Configuration</string>
+<string name="eth_quick_toggle_title">Ethernet</string>
+<string name="eth_toggle_summary_on">Turn on Ethernet </string>
 <string name="eth_conf_save">Save</string>
 <string name="eth_conf_cancel">Cancel</string>
 <string name="eth_radio_ctrl_title">Ethernet Configuration</string>
@@ -2033,4 +2033,5 @@ found in the list of installed applications.</string>
 <string name="eth_conf_perf_title">Ethernet Configuration</string>
 <string name="eth_conf_summary">Configure Ethernet Devices</string>
 <string name="eth_mask">Netmask</string>
+<string name="eth_toggle_summary_off">Turn off Ethernet</string>
 </resources>

--- a/res/xml/ethernet_settings.xml
+++ b/res/xml/ethernet_settings.xml
@@ -20,7 +20,8 @@
         <CheckBoxPreference
             android:key="toggle_eth"
             android:title="@string/eth_quick_toggle_title"
-            android:summary="@string/eth_quick_toggle_summary"
+            android:summaryOn="@string/eth_toggle_summary_off"
+            android:summaryOff="@string/eth_toggle_summary_on"
             android:persistent="false" />
         <Preference
             android:title="@string/eth_conf_perf_title"

--- a/src/com/android/settings/ethernet/EthernetEnabler.java
+++ b/src/com/android/settings/ethernet/EthernetEnabler.java
@@ -62,8 +62,9 @@ public class EthernetEnabler implements Preference.OnPreferenceChangeListener{
 
 	        mOriginalSummary = ethernetCheckBoxPreference.getSummary();
 	        ethernetCheckBoxPreference.setPersistent(false);
-	        if(mEthManager.getEthState() == ETH_STATE_ENABLED)
+	        if(mEthManager.getEthState() == ETH_STATE_ENABLED) {
 			mEthCheckBoxPref.setChecked(true);
+	        }
 
 	        /*
 	        mEthStateFilter = new IntentFilter(EthernetManager.ETH_STATE_CHANGED_ACTION);