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

Commit b4c35913 authored by nkk71's avatar nkk71 Committed by Dees Troy
Browse files

Auto detect possible use of legacy props 

* Revert: Make legacy props an option disabled by default
  (reverted from commit 75aa6157)

* Instead check for ANDROID_PROPERTY_WORKSPACE in the updater-
  binary to determine whether legacy property service can be
  used

Change-Id: If68d5cca9a2b56edcb1c73db0474668cf46d8c91
parent 04ec0952

data.cpp

+2 −3
Original line number Diff line number Diff line
@@ -833,20 +833,19 @@ void DataManager::SetDefaultValues() 
#else

	mConst.SetValue("tw_has_boot_slots", "0");

#endif



#ifdef TW_NO_LEGACY_PROPS

	LOGINFO("TW_NO_LEGACY_PROPS := true\n");

	mConst.SetValue("tw_enable_legacy_props", "0");

#endif



#ifdef TW_OEM_BUILD

	LOGINFO("TW_OEM_BUILD := true\n");

	mConst.SetValue("tw_oem_build", "1");

	mConst.SetValue("tw_enable_legacy_props", "0");

#else

	mConst.SetValue("tw_oem_build", "0");

	mPersist.SetValue("tw_app_prompt", "1");

	mPersist.SetValue("tw_app_install_system", "1");

	mData.SetValue("tw_app_install_status", "0"); // 0 = no status, 1 = not installed, 2 = already installed

	mPersist.SetValue("tw_enable_legacy_props", "0");

#endif



	pthread_mutex_unlock(&m_valuesLock);

gui/theme/common/landscape.xml

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

gui/theme/common/languages/en.xml

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

gui/theme/common/portrait.xml

+1 −7
Original line number Diff line number Diff line
@@ -392,15 +392,9 @@ 
				<data variable="tw_install_reboot"/>

			</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>

gui/theme/common/watch.xml

+0 −6
Original line number Diff line number Diff line
@@ -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%"/>