Auto detect possible use of legacy props
* Revert: Make legacy props an option disabled by default
(reverted from commit 75aa615767457f2b62dda65b16ded41b0e6df11f)
* Instead check for ANDROID_PROPERTY_WORKSPACE in the updater-
binary to determine whether legacy property service can be
used
Change-Id: If68d5cca9a2b56edcb1c73db0474668cf46d8c91
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 5e64010..c3d89fe 100644
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -447,12 +447,6 @@
<data variable="tw_install_reboot"/>
</checkbox>
- <checkbox>
- <placement x="%col1_x_right%" y="%row13a_y%"/>
- <text>{@enable_legacy_props_chk=Enable legacy properties for old zips}</text>
- <data variable="tw_enable_legacy_props"/>
- </checkbox>
-
<button style="main_button_half_width">
<placement x="%col1_x_left%" y="%row15a_y%"/>
<text>{@zip_add_btn=Add more Zips}</text>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 559475c..8a1be18 100644
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -82,7 +82,6 @@
<string name="folder">Folder:</string>
<string name="file">File:</string>
<string name="zip_sig_chk">Zip signature verification</string>
- <string name="enable_legacy_props_chk">Enable legacy properties for old zips</string>
<string name="inject_twrp_chk">Inject TWRP after install</string>
<string name="install_reboot_chk">Reboot after installation is complete</string>
<string name="options_hdr">Options</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index c101014..f163bea 100644
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -393,14 +393,8 @@
</checkbox>
<checkbox>
- <placement x="%indent%" y="%row15_y%"/>
- <text>{@enable_legacy_props_chk=Enable legacy properties for old zips}</text>
- <data variable="tw_enable_legacy_props"/>
- </checkbox>
-
- <checkbox>
<condition var1="tw_has_injecttwrp" var2="1"/>
- <placement x="%indent%" y="%row16a_y%"/>
+ <placement x="%indent%" y="%row15_y%"/>
<text>{@inject_twrp_chk=Inject TWRP after install}</text>
<data variable="tw_inject_after_zip"/>
</checkbox>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 2a82345..d5ef869 100644
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -555,12 +555,6 @@
<data variable="tw_install_reboot"/>
</checkbox>
- <checkbox>
- <placement x="%indent%" y="%row5a_y%"/>
- <text>{@enable_legacy_props_chk=Enable legacy properties for old zips}</text>
- <data variable="tw_enable_legacy_props"/>
- </checkbox>
-
<button>
<placement x="%col1_x_left%" y="%row11_y%"/>
<highlight color="%highlight_color%"/>