copy log: add option to include logcat
Change-Id: I9689df4560d5209f385fbbc3e233859754b3ebbd
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 99cd126..ae9b4be 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -2842,7 +2842,7 @@
<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
<action function="page">rebootcheck</action>
</actions>
- </button>
+ </listitem>
</listbox>
<button style="main_button">
@@ -3465,7 +3465,14 @@
</text>
<checkbox>
+ <condition var1="tw_logcat_exists" var2="1"/>
<placement x="%indent%" y="%row4_y%"/>
+ <text>{@include_logcat=Include Logcat}</text>
+ <data variable="tw_include_logcat" value="1"/>
+ </checkbox>
+
+ <checkbox>
+ <placement x="%indent%" y="%row6_y%"/>
<text>{@include_kernel_log=Include Kernel Log}</text>
<data variable="tw_include_kernel_log" value="1"/>
</checkbox>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index ac603e6..13b2975 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -740,7 +740,9 @@
<string name="twrp_adbbu_option">--twrp option is required to enable twrp adb backup</string>
<string name="partition_not_found">path: {1} not found in partititon list</string>
<string name="copy_kernel_log">Copied kernel log to {1}</string>
+ <string name="copy_logcat">Copied logcat to {1}</string>
<string name="include_kernel_log">Include Kernel Log</string>
+ <string name="include_logcat">Include Logcat</string>
<string name="sha2_chk">Use SHA2 for hashing</string>
<string name="unable_set_boot_slot">Error changing bootloader boot slot to {1}</string>
<string name="unmount_sys_install">Unmount System before installing a ZIP</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 4f36e46..4efed64 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -2998,7 +2998,7 @@
<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>
<action function="page">rebootcheck</action>
</actions>
- </button>
+ </listitem>
</listbox>
<text style="text_m">
@@ -3586,7 +3586,14 @@
</text>
<checkbox>
+ <condition var1="tw_logcat_exists" var2="1"/>
<placement x="%indent%" y="%row4_y%"/>
+ <text>{@include_logcat=Include Logcat}</text>
+ <data variable="tw_include_logcat" value="1"/>
+ </checkbox>
+
+ <checkbox>
+ <placement x="%indent%" y="%row6_y%"/>
<text>{@include_kernel_log=Include Kernel Log}</text>
<data variable="tw_include_kernel_log" value="1"/>
</checkbox>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 251e0f6..171fc38 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -266,6 +266,13 @@
<data variable="tw_include_kernel_log" value="1"/>
</checkbox>
+ <checkbox>
+ <condition var1="tw_logcat_exists" var2="1"/>
+ <placement x="%indent%" y="%row2_y%"/>
+ <text>{@include_logcat=Include Logcat}</text>
+ <data variable="tw_include_logcat" value="1"/>
+ </checkbox>
+
<slider>
<text>{@swipe_confirm= Confirm}</text>
<actions>