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

am 26c433c1: am 489c7bff: show Build.SERIAL in settings > about > status

Browse Source 
* commit '26c433c1c64416aed4736bb5a76b0ac4585958a1':
  show Build.SERIAL in settings > about > status
This commit is contained in:
Doug Zongker
2011-02-25 17:30:55 -08:00
committed by Android Git Automerger
parent 7e3ff8eca6 26c433c1c6
commit e18897bc22
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1548,6 +1548,8 @@
<string name="status_wifi_mac_address">Wi-Fi MAC address</string> <string name="status_wifi_mac_address">Wi-Fi MAC address</string>
<!-- About phone, status item title. The bluetooth adapter's hardware address--> <!-- About phone, status item title. The bluetooth adapter's hardware address-->
<string name="status_bt_address">Bluetooth address</string> <string name="status_bt_address">Bluetooth address</string>
<!-- About phone, status item title. The hardware serial number. [CHAR LIMIT=30]-->
<string name="status_serial_number">Serial number</string>
<!-- About phone, status item value if the actual value is not available. --> <!-- About phone, status item value if the actual value is not available. -->
<string name="status_unavailable">Unavailable</string> <string name="status_unavailable">Unavailable</string>
<!-- About phone, status item title. How long the device has been running since its last reboot. --> <!-- About phone, status item title. How long the device has been running since its last reboot. -->

5
res/xml/device_info_status.xml
View File

@@ -100,6 +100,11 @@
android:title="@string/status_bt_address" android:title="@string/status_bt_address"
android:summary="@string/device_info_not_available" android:summary="@string/device_info_not_available"
android:persistent="false" /> android:persistent="false" />
<Preference android:key="serial_number"
style="?android:attr/preferenceInformationStyle"
android:title="@string/status_serial_number"
android:summary="@string/device_info_not_available"
android:persistent="false" />
<Preference android:key="up_time" <Preference android:key="up_time"
style="?android:attr/preferenceInformationStyle" style="?android:attr/preferenceInformationStyle"
android:title="@string/status_up_time" android:title="@string/status_up_time"

9
src/com/android/settings/deviceinfo/Status.java
View File

@@ -25,6 +25,7 @@ import android.content.res.Resources;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.BatteryManager; import android.os.BatteryManager;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
@@ -78,6 +79,7 @@ public class Status extends PreferenceActivity {
private static final String KEY_BATTERY_LEVEL = "battery_level"; private static final String KEY_BATTERY_LEVEL = "battery_level";
private static final String KEY_WIFI_MAC_ADDRESS = "wifi_mac_address"; private static final String KEY_WIFI_MAC_ADDRESS = "wifi_mac_address";
private static final String KEY_BT_ADDRESS = "bt_address"; private static final String KEY_BT_ADDRESS = "bt_address";
private static final String KEY_SERIAL_NUMBER = "serial_number";
private static final int EVENT_SIGNAL_STRENGTH_CHANGED = 200; private static final int EVENT_SIGNAL_STRENGTH_CHANGED = 200;
private static final int EVENT_SERVICE_STATE_CHANGED = 300; private static final int EVENT_SERVICE_STATE_CHANGED = 300;
@@ -236,6 +238,13 @@ public class Status extends PreferenceActivity {
setWifiStatus(); setWifiStatus();
setBtStatus(); setBtStatus();
String serial = Build.SERIAL;
if (serial != null && !serial.equals("")) {
setSummaryText(KEY_SERIAL_NUMBER, serial);
} else {
removePreferenceFromScreen(KEY_SERIAL_NUMBER);
}
} }
@Override @Override