4.4设置增加租约时间显示

diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index f7ad187..c7879db 100755
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -60,12 +60,20 @@
     "10 分钟"
     "30 分钟"
   
-  
+  
    IP 地址
    子网掩码
    网关
    域名系统(DNS)
    Mac 地址
+   租约时间
+  
+  
+        IP 地址
+        子网掩码
+        网关
+        域名系统(DNS)
+        Mac 地址
   
   
     "小"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 405d3f7..0f96a74 100755
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -59,6 +59,15 @@
         30 minutes
         "Never timeout"
     
+    
+        IP Adddress
+        Subnet Mask
+        Gateway
+        DNS
+        Mac Address
+        Lease Time
+    
+   
     
         IP Adddress
         Subnet Mask
diff --git a/src/com/android/settings/NetworkStatus.java b/src/com/android/settings/NetworkStatus.java
index 177cd3a..307d2df 100755
--- a/src/com/android/settings/NetworkStatus.java
+++ b/src/com/android/settings/NetworkStatus.java
@@ -100,7 +100,7 @@ public class NetworkStatus extends Fragment implements
         mListContainer = mRootView.findViewById(R.id.list_view);
         ListView lv = (ListView) mListContainer.findViewById(R.id.listview);
         Resources res =getResources();
-        netstatusname = res.getStringArray(R.array.network_status_entries);
+        netstatusname = res.getStringArray(R.array.network_status_entries_dhcp);
         mListView =lv;
         // this tmpinfo array should be wifi status info,now have no idea to get wifi info,so set null at present
         String ip_address = null;
@@ -108,6 +108,7 @@ public class NetworkStatus extends Fragment implements
         String gate_way = null;
         String dns = null;
         String mac_address = null;
+        String lease_time = null;
         mac_address = getWifiMacAddress();
         String [] tmpinfo;
         String wifi_dev_status = getIfDevStatus(WIFI_DEV_STATUS);
@@ -118,9 +119,10 @@ public class NetworkStatus extends Fragment implements
                 subnet_mask = NetworkUtils.intToInetAddress(dinfo.netmask).getHostAddress();
                 gate_way = NetworkUtils.intToInetAddress(dinfo.gateway).getHostAddress();
                 dns = NetworkUtils.intToInetAddress(dinfo.dns1).getHostAddress();
+                lease_time = String.valueOf(dinfo.leaseDuration);
             }
         }
-        tmpinfo = new String[] {ip_address, subnet_mask, gate_way, dns, mac_address};
+        tmpinfo = new String[] {ip_address, subnet_mask, gate_way, dns, mac_address, lease_time};
         NetStatusAdapter netStatusAdapter = new NetStatusAdapter(getActivity(), netstatusname, tmpinfo);
         mListView.setAdapter(netStatusAdapter);
         mTabHost = (TabHost) inflater.inflate(R.layout.network_status_tabhost, container, false);
@@ -170,6 +172,10 @@ public class NetworkStatus extends Fragment implements
     public void onTabChanged(String tabId) {
         try {
             String []statusinfo = showCurrentTab();
+            if(statusinfo.length == 5)
+              netstatusname = getResources().getStringArray(R.array.network_status_entries);
+            else
+              netstatusname = getResources().getStringArray(R.array.network_status_entries_dhcp);
             NetStatusAdapter netStatusAdapter = new NetStatusAdapter(getActivity(), netstatusname, statusinfo);
             mListView.setAdapter(netStatusAdapter);
         } catch (Exception e) {
@@ -196,6 +202,7 @@ public class NetworkStatus extends Fragment implements
         String wifi_dev_status = getIfDevStatus(WIFI_DEV_STATUS);
         String pppoe_dev_status = getIfDevStatus(PPPOE_DEV_STATUS);
         String statusinfo[];
+        String lease_time = null;
         EthernetDevInfo info = mEthManager.getSavedEthConfig();
         statusinfo  = new String[] {null,null,null,null,null};
         if (TAB_WIFI.equalsIgnoreCase(tabId)) {
@@ -207,9 +214,10 @@ public class NetworkStatus extends Fragment implements
                     subnet_mask = NetworkUtils.intToInetAddress(dinfo.netmask).getHostAddress();
                     gate_way = NetworkUtils.intToInetAddress(dinfo.gateway).getHostAddress();
                     dns = NetworkUtils.intToInetAddress(dinfo.dns1).getHostAddress();
+                    lease_time = String.valueOf(dinfo.leaseDuration);
                 }
             }
-            statusinfo = new String[] {ip_address, subnet_mask, gate_way, dns, mac_address};
+            statusinfo = new String[] {ip_address, subnet_mask, gate_way, dns, mac_address, lease_time};
         } else if (TAB_ETHNET.equalsIgnoreCase(tabId)) {
             mac_address = readMacAddress();
             if("up".equals(ethernet_dev_status) &&
@@ -222,8 +230,9 @@ public class NetworkStatus extends Fragment implements
                     subnet_mask = NetworkUtils.intToInetAddress(dinfo.netmask).getHostAddress();
                     gate_way = NetworkUtils.intToInetAddress(dinfo.gateway).getHostAddress();
                     dns = NetworkUtils.intToInetAddress(dinfo.dns1).getHostAddress();
+                    lease_time = String.valueOf(dinfo.leaseDuration);
                 }
-                statusinfo = new String[] {ip_address, subnet_mask, gate_way, dns, mac_address};
+                statusinfo = new String[] {ip_address, subnet_mask, gate_way, dns, mac_address, lease_time};
             } else if("up".equals(ethernet_dev_status) &&
                     info.getConnectMode().equals(EthernetDevInfo.ETH_CONN_MODE_MANUAL)) {
                 Log.d(TAG, "----------connected mode:manual");
@@ -248,9 +257,10 @@ public class NetworkStatus extends Fragment implements
                     subnet_mask = NetworkUtils.intToInetAddress(dinfo.netmask).getHostAddress();
                     gate_way = NetworkUtils.intToInetAddress(dinfo.gateway).getHostAddress();
                     dns = NetworkUtils.intToInetAddress(dinfo.dns1).getHostAddress();
+                    lease_time = String.valueOf(dinfo.leaseDuration);
                 }
             }
-            statusinfo = new String[] {ip_address, subnet_mask, gate_way, dns, mac_address};
+            statusinfo = new String[] {ip_address, subnet_mask, gate_way, dns, mac_address, lease_time};
         } else if (TAB_IPV6.equalsIgnoreCase(tabId)) {
             mac_address = readMacAddress();
             Log.d(TAG,"----------------ipv6 status");