Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a481509 authored by Thierry Strudel's avatar Thierry Strudel Committed by Android (Google) Code Review
Browse files

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)
parents c3264b01 66b89bc2

packages/SettingsLib/res/values/arrays.xml

+24 −0
Original line number Diff line number Diff line
@@ -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>

packages/SettingsLib/res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -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] -->