Show device serial number in Settings > About

Bug: 17514695
Change-Id: Id09c77fea8281746764f4c71c68867355cd7cd71

Settings/res/values/strings.xml

@@ -243,6 +243,8 @@
     <string name="about_model">Model</string>
     <!-- Preference which shows version. [CHAR LIMIT=50] -->
     <string name="about_version">Version</string>
+    <!-- Preference which shows serial number. [CHAR LIMIT=50] -->
+    <string name="about_serial">Serial number</string>
     <!-- Preference which shows build version. [CHAR LIMIT=50] -->
     <string name="about_build">Build</string>
     <!-- Device Info screen. Countdown for user taps to enable development settings [CHAR LIMIT=NONE] -->

Settings/src/com/android/tv/settings/about/AboutActivity.java

@@ -73,7 +73,7 @@ public class AboutActivity extends DialogActivity implements ActionAdapter.Liste
     /**
      * Intent action of device name activity.
      */
-    private static final String SETTINGS_CAST_DEVICE_NAME_INTENT_ACTION =
+    private static final String SETTINGS_DEVICE_NAME_INTENT_ACTION =
         "android.settings.DEVICE_NAME";
 
     /**
@@ -189,7 +189,7 @@ public class AboutActivity extends DialogActivity implements ActionAdapter.Liste
                 .key("name")
                 .title(getString(R.string.device_name))
                 .description(DeviceManager.getDeviceName(this))
-                .intent(new Intent(SETTINGS_CAST_DEVICE_NAME_INTENT_ACTION))
+                .intent(new Intent(SETTINGS_DEVICE_NAME_INTENT_ACTION))
                 .build());
         actions.add(new Action.Builder()
                 .key(KEY_LEGAL_INFO)
@@ -207,6 +207,12 @@ public class AboutActivity extends DialogActivity implements ActionAdapter.Liste
                 .description(Build.VERSION.RELEASE)
                 .enabled(false)
                 .build());
+        actions.add(new Action.Builder()
+                .key("serial")
+                .title(getString(R.string.about_serial))
+                .description(Build.SERIAL)
+                .enabled(false)
+                .build());
         actions.add(new Action.Builder()
                 .key(KEY_BUILD)
                 .title(getString(R.string.about_build))