commit 6a50c4555c85a0017e63cea33fc34d157e96160c
author Matthew Fritze <mfritze@google.com> Wed May 31 22:47:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 31 22:47:27 2017 +0000
tree 9f0a8761ffdea66b21e050d0c4216364eae73498
parent 98952ced4fd8c8bfc57b32ad34e5c862bcf505da
parent 564d90faf03f097f6bad4bf87f8cca0133e1559d

Merge "Remove dynamic summary from Security Patch info" into oc-dev
am: 564d90faf0

Change-Id: I91993bdbf7de1256fb8149478126ec507833611b

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 89be8c7..2f7aa64 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -31,8 +31,6 @@
     <string name="dlg_switch">Switch</string>
 
     <!-- Device Info --> <skip />
-    <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
-    <string name="device_info_default">Unknown</string>
     <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
     <plurals name="show_dev_countdown">
         <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from being a developer.</item>

res/xml/device_info_settings.xml

diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 7482031..230f612 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -74,7 +74,7 @@
         <!-- Security patch level -->
         <Preference android:key="security_patch"
                 android:title="@string/security_patch"
-                android:summary="@string/device_info_default">
+                android:summary="@string/summary_placeholder">
                 <intent android:action="android.intent.action.VIEW"
                         android:data="https://source.android.com/security/bulletin/" />
         </Preference>