Commit: c51ed8777b93140ea019e846b356ddd30462d9ed - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• Revision: c51ed8777b93140ea019e846b356ddd30462d9ed (tree)
• Zeit: 2010-02-02 18:47:08
• Autor: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

remove unused strings

Ändern Zusammenfassung

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

Diff

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2173,11 +2173,12 @@ found in the list of installed applications.</string>
 
     <!-- Proxy settings -->
     <string name="proxy_setting">Proxy settings</string>
-    <string name="proxy_setting_summary">Configure a proxy to access Internet</string>
+
     <string name="softkeyboard_enable">SoftKeyBoard Enable</string>
     <string name="softkeyboard_enable_summary">Enable SoftKeyBoard</string>
     <string name="keyboard_layout_title">Keyboard layout setting</string>
     <string name="keyboard_layout_summary">Choose a keyboard layout</string>
+
     <!-- Ethernet configuration dialog -->
     <string name="eth_config_title">Configure Ethernet device</string>
     <string name="eth_setting">Ethernet setting</string>
@@ -2190,10 +2191,7 @@ found in the list of installed applications.</string>
     <string name="eth_ipaddr">IP address</string>
     <string name="eth_quick_toggle_title">Ethernet</string>
     <string name="eth_quick_toggle_summary">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>
-    <string name="eth_radio_ctrl_summary">Configure Ethernet devices</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>

--- a/src/com/android/settings/ethernet/EthernetConfigDialog.java
+++ b/src/com/android/settings/ethernet/EthernetConfigDialog.java
@@ -91,8 +91,8 @@ AdapterView.OnItemSelectedListener, View.OnClickListener{
         });
 
 		this.setInverseBackgroundForced(true);
-		this.setButton(BUTTON_POSITIVE, context.getText(R.string.eth_conf_save), this);
-		this.setButton(BUTTON_NEGATIVE, context.getText(R.string.eth_conf_cancel), this);
+		this.setButton(BUTTON_POSITIVE, context.getText(R.string.menu_save), this);
+		this.setButton(BUTTON_NEGATIVE, context.getText(R.string.menu_cancel), this);
 		String[] Devs = mEthEnabler.getManager().getDeviceNameList();
 		if (Devs != null) {
 			Log.i(TAG,"found device: " + Devs[0]);