diff options
| author | 2016-07-21 04:07:22 +0000 | |
|---|---|---|
| committer | 2016-07-21 04:07:24 +0000 | |
| commit | 1a48150980bc56ad899f37dd96d45fb79c0b57e6 (patch) | |
| tree | f99202e2877de37870e8ce734b47a88b2b34c8e1 | |
| parent | c3264b01ed1b15e75dc74041c76e57d40d9e20da (diff) | |
| parent | 66b89bc2da97a8bb07d96fa20884f8a178f5ea26 (diff) | |
Merge changes from topic 'enable_persist_kernel_log' into nyc-mr1-dev
* changes:
Settings: add logpersist kernel only selection (strings)
Settings: add logpersist selection (strings)
| -rw-r--r-- | packages/SettingsLib/res/values/arrays.xml | 24 | ||||
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 8 |
2 files changed, 32 insertions, 0 deletions
diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml index b8e6d20cc0e2..920e061b3771 100644 --- a/packages/SettingsLib/res/values/arrays.xml +++ b/packages/SettingsLib/res/values/arrays.xml @@ -138,6 +138,30 @@ <item>16M per log buffer</item> </string-array> + <!-- Values for logpersist state selection preference. --> + <string-array name="select_logpersist_values" translatable="false" > + <item></item> + <item>all</item> + <item>default,security,kernel</item> + <item>kernel</item> + </string-array> + + <!-- Titles for logpersist state selection preference. [CHAR LIMIT=14] --> + <string-array name="select_logpersist_titles"> + <item>Off</item> + <item>All</item> + <item>All but radio</item> + <item>kernel only</item> + </string-array> + + <!-- Summaries for logpersist state selection preference. [CHAR LIMIT=50]--> + <string-array name="select_logpersist_summaries" > + <item>Off</item> + <item>All log buffers</item> + <item>All but radio log buffers</item> + <item>kernel log buffer only</item> + </string-array> + <!-- Titles for window animation scale preference. [CHAR LIMIT=35] --> <string-array name="window_animation_scale_entries"> <item>Animation off</item> diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 97121e9d6f6f..7d42211be5e5 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -438,6 +438,14 @@ <string name="select_logd_size_title">Logger buffer sizes</string> <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] --> <string name="select_logd_size_dialog_title">Select Logger sizes per log buffer</string> + <!-- UI debug setting: store logs persistently --> + <string name="dev_logpersist_clear_warning_title">Clear logger persistent storage?</string> + <!-- Warning text to user about the implications of enabling USB debugging --> + <string name="dev_logpersist_clear_warning_message">When we no longer are monitoring with the persistent logger, we are required to erase the logger data resident on your device.</string> + <!-- Title of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=32] --> + <string name="select_logpersist_title">Store logger data persistently on device</string> + <!-- UI debug setting: select which logs to store persistently [CHAR LIMIT=80] --> + <string name="select_logpersist_dialog_title">Select log buffers to store persistently on device</string> <!-- UI debug setting: select USB configuration --> <string name="select_usb_configuration_title">Select USB Configuration</string> <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] --> |