summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-05-12 10:19:09 -0700
committerMark Salyzyn <salyzyn@google.com>2014-06-13 20:20:08 +0000
commit408c89bfb5738322fbea5e4119f7052173ceefc6 (patch)
tree36b9201f1b78424a96818b2ee577475f877770da /res
parent2ce0dcdad47e132dbe0f9cd16146b8e3c6b11cd6 (diff)
downloadpackages_apps_Settings-408c89bfb5738322fbea5e4119f7052173ceefc6.zip
packages_apps_Settings-408c89bfb5738322fbea5e4119f7052173ceefc6.tar.gz
packages_apps_Settings-408c89bfb5738322fbea5e4119f7052173ceefc6.tar.bz2
logd: Add Developer settings for size
- Dependent on some logd/init/selinux security changes. Bug: 14563261 Change-Id: I11e3aa97a0ba40c3f55041d98c02d7e73629e984
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml27
-rw-r--r--res/values/strings.xml4
-rw-r--r--res/xml/development_prefs.xml8
3 files changed, 39 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index a4de070..7e094d4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -891,6 +891,33 @@
<item>Use ART debug build</item>
</string-array>
+ <!-- Titles for logd limit size selection preference. [CHAR LIMIT=14] -->
+ <string-array name="select_logd_size_titles">
+ <item>64K</item>
+ <item>256K</item>
+ <item>1M</item>
+ <item>4M</item>
+ <item>16M</item>
+ </string-array>
+
+ <!-- Values for logd limit size selection preference. -->
+ <string-array name="select_logd_size_values" translatable="false" >
+ <item>65536</item>
+ <item>262144</item>
+ <item>1048576</item>
+ <item>4194304</item>
+ <item>16777216</item>
+ </string-array>
+
+ <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=19]-->
+ <string-array name="select_logd_size_summaries" >
+ <item>64K per log buffer</item>
+ <item>256K per log buffer</item>
+ <item>1M per log buffer</item>
+ <item>4M per log buffer</item>
+ <item>16M per log buffer</item>
+ </string-array>
+
<!-- Titles for HDCP checking preference. [CHAR LIMIT=35] -->
<string-array name="hdcp_checking_titles">
<item>Never check</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 22eb3e8..7f4293b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3166,6 +3166,10 @@
<string name="wifi_display_certification">Wireless display certification</string>
<!-- setting Checkbox summary whether to show options for wireless display certification -->
<string name="wifi_display_certification_summary">Show options for wireless display certification</string>
+ <!-- UI debug setting: limit size of Android logger buffers -->
+ <string name="select_logd_size_title">Logger buffer sizes</string>
+ <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=34] -->
+ <string name="select_logd_size_dialog_title">Select Logger sizes per log buffer</string>
<!-- Setting Checkbox title whether to allow mock locations -->
<string name="allow_mock_location">Allow mock locations</string>
<!-- setting Checkbox summary whether to allow mock locations -->
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 5989c90..230af0d 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -105,6 +105,14 @@
android:key="wifi_display_certification"
android:title="@string/wifi_display_certification"
android:summary="@string/wifi_display_certification_summary"/>
+
+ <ListPreference
+ android:key="select_logd_size"
+ android:title="@string/select_logd_size_title"
+ android:dialogTitle="@string/select_logd_size_dialog_title"
+ android:entries="@array/select_logd_size_titles"
+ android:entryValues="@array/select_logd_size_values" />
+
</PreferenceCategory>
<PreferenceCategory android:key="debug_input_category"