From 3e05a7054334cae013bd3444558b546ebbdbd8d9 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Fri, 3 Jun 2016 14:05:05 -0700
Subject: [PATCH 1/2] Settings: add logpersist selection (strings)

(cherry picked from commit 954ed57091a6471f1873c9954fbb16a4f65a25b5)

Strings for selecting between Off, All and All minus radio to
store logs persistently on the local eMMC device. Strings for
warning button when erasing logpersist data.

Bug: 28813587
Bug: 28936216
Change-Id: I3aaa59a6ebbe1a695490b4a72cad2c807c048985
---
 packages/SettingsLib/res/values/arrays.xml  | 21 +++++++++++++++++++++
 packages/SettingsLib/res/values/strings.xml |  8 ++++++++
 2 files changed, 29 insertions(+)

diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml
index 525d6f421d71d..a4a0e6b666234 100644
--- a/packages/SettingsLib/res/values/arrays.xml
+++ b/packages/SettingsLib/res/values/arrays.xml
@@ -138,6 +138,27 @@
         <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>
+    </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>
+    </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>
+    </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 97121e9d6f6f5..7d42211be5e59 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] -->

From 66b89bc2da97a8bb07d96fa20884f8a178f5ea26 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Thu, 7 Jul 2016 11:30:32 -0700
Subject: [PATCH 2/2] Settings: add logpersist kernel only selection (strings)

Bug: 28813587
Bug: 28936216
Bug: 29831823
Change-Id: I4e578bbe2f5bbf936b03fbdac34a225a0432e503
---
 packages/SettingsLib/res/values/arrays.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml
index a4a0e6b666234..eac39647bddde 100644
--- a/packages/SettingsLib/res/values/arrays.xml
+++ b/packages/SettingsLib/res/values/arrays.xml
@@ -143,6 +143,7 @@
         <item></item>
         <item>all</item>
         <item>default,security,kernel</item>
+        <item>kernel</item>
     </string-array>
 
     <!-- Titles for logpersist state selection preference. [CHAR LIMIT=14] -->
@@ -150,6 +151,7 @@
         <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]-->
@@ -157,6 +159,7 @@
         <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] -->