PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3f7e5fc1: am ce258caa: Merge changes I8f067f14,I54d8255a,Ib15917bf

Browse Source 
* commit '3f7e5fc170930df1b049c88a0d2b423dbc83252a':
  Settings: crashing when turning ON<>OFF developer option. DO NOT MERGE
  Settings: logd: increase dialog title field size to 59
  Settings: logd: increase summary field size to 30
This commit is contained in:
Mark Salyzyn
2014-06-18 14:24:25 +00:00
committed by Android Git Automerger
parent 2adb80434c 3f7e5fc170
commit 2160b50309
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/arrays.xml
View File

@@ -913,7 +913,7 @@
<item>16777216</item> <item>16777216</item>
</string-array> </string-array>
<!-- Summaries for logd limit size selection preference. [CHAR LIMIT=19]--> <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=30]-->
<string-array name="select_logd_size_summaries" > <string-array name="select_logd_size_summaries" >
<item>64K per log buffer</item> <item>64K per log buffer</item>
<item>256K per log buffer</item> <item>256K per log buffer</item>

2
res/values/strings.xml
View File

@@ -3182,7 +3182,7 @@
<string name="wifi_verbose_logging_summary">Increase Wifi logging level, show per SSID RSSI in WiFi Picker</string> <string name="wifi_verbose_logging_summary">Increase Wifi logging level, show per SSID RSSI in WiFi Picker</string>
<!-- UI debug setting: limit size of Android logger buffers --> <!-- UI debug setting: limit size of Android logger buffers -->
<string name="select_logd_size_title">Logger buffer sizes</string> <string name="select_logd_size_title">Logger buffer sizes</string>
<!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=34] --> <!-- 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> <string name="select_logd_size_dialog_title">Select Logger sizes per log buffer</string>
<!-- Setting Checkbox title whether to allow mock locations --> <!-- Setting Checkbox title whether to allow mock locations -->
<string name="allow_mock_location">Allow mock locations</string> <string name="allow_mock_location">Allow mock locations</string>