summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorPhilip Milne <pmilne@google.com>2012-06-06 17:34:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-06 17:34:39 -0700
commitceb1ff2a5530ce921930b728fb6c4f5c0a8a08bf (patch)
treeb011c89676b7e6b15ba430db2092a0dbd1805a6e /res
parentec71971c34c61662ed25a8eaaaf8749e47d5bed5 (diff)
parentc00b4f29de028fb94f51cd7aea9c4bfd0b65f549 (diff)
downloadpackages_apps_Settings-ceb1ff2a5530ce921930b728fb6c4f5c0a8a08bf.zip
packages_apps_Settings-ceb1ff2a5530ce921930b728fb6c4f5c0a8a08bf.tar.gz
packages_apps_Settings-ceb1ff2a5530ce921930b728fb6c4f5c0a8a08bf.tar.bz2
Merge "Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"" into jb-dev
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4fe86c8..ebe764c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3703,7 +3703,7 @@
<!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] -->
<string name="debug_layout">Show layout bounds</string>
<!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->
- <string name="debug_layout_summary">Display information about bounds, padding, etc.</string>
+ <string name="debug_layout_summary">Show clip bounds, margins, etc.</string>
<!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
<string name="show_cpu_usage">Show CPU usage</string>