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

Commit 8dc25b79 authored by Matt Mower's avatar Matt Mower Committed by Ethan Yonker
Browse files

Fixup reboot after install variables 

* Create correctly named data manager variable 'tw_install_reboot'
* Make configurable through Settings
* Remove closing tag space in theme files (not personal preference,
  but should match surrounding code style)
* Fix the "two presses needed to enable" issue for the checkbox on the
  install screen

Change-Id: I0ceb60b4888a672e2f0ecb5672b03cc86615621a
parent 9a2a2050

data.cpp

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ void DataManager::SetDefaultValues() 
	mConst.SetValue(TW_MIN_SYSTEM_VAR, TW_MIN_SYSTEM_SIZE);

	mData.SetValue(TW_BACKUP_NAME, "(Auto Generate)");



	mPersist.SetValue(TW_REBOOT_AFTER_FLASH_VAR, "0");

	mPersist.SetValue(TW_INSTALL_REBOOT_VAR, "0");

	mPersist.SetValue(TW_SIGNED_ZIP_VERIFY_VAR, "0");

	mPersist.SetValue(TW_FORCE_MD5_CHECK_VAR, "0");

	mPersist.SetValue(TW_DISABLE_FREE_SPACE_VAR, "0");

gui/theme/common/landscape.xml

+5 −2
Original line number Diff line number Diff line
@@ -2771,6 +2771,9 @@ 
				<listitem name="{@zip_sig_chk=Zip signature verification}">

					<data variable="tw_signed_zip_verify"/>

				</listitem>

				<listitem name="{@install_reboot_chk=Reboot after installation is complete}">

					<data variable="tw_install_reboot"/>

				</listitem>

				<listitem name="{@use_rmrf_chk=Use rm -rf instead of formatting}">

					<data variable="tw_rm_rf"/>

				</listitem>

gui/theme/common/portrait.xml

+5 −2
Original line number Diff line number Diff line
@@ -2904,6 +2904,9 @@ 
				<listitem name="{@zip_sig_chk=Zip signature verification}">

					<data variable="tw_signed_zip_verify"/>

				</listitem>

				<listitem name="{@install_reboot_chk=Reboot after installation is complete}">

					<data variable="tw_install_reboot"/>

				</listitem>

				<listitem name="{@use_rmrf_chk=Use rm -rf instead of formatting}">

					<data variable="tw_rm_rf"/>

				</listitem>

gui/theme/common/watch.xml

+5 −2
Original line number Diff line number Diff line
@@ -3467,6 +3467,9 @@ 
				<listitem name="{@zip_sig_chk=Zip signature verification}">

					<data variable="tw_signed_zip_verify"/>

				</listitem>

				<listitem name="{@install_reboot_chk=Reboot after installation is complete}">

					<data variable="tw_install_reboot"/>

				</listitem>

				<listitem name="{@use_rmrf_chk=Use rm -rf instead of formatting}">

					<data variable="tw_rm_rf"/>

				</listitem>

variables.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
#define TW_SKIP_MD5_GENERATE_VAR    "tw_skip_md5_generate"

#define TW_DISABLE_FREE_SPACE_VAR   "tw_disable_free_space"

#define TW_SIGNED_ZIP_VERIFY_VAR    "tw_signed_zip_verify"

#define TW_REBOOT_AFTER_FLASH_VAR   "tw_reboot_after_flash_option"

#define TW_INSTALL_REBOOT_VAR       "tw_install_reboot"

#define TW_TIME_ZONE_VAR            "tw_time_zone"

#define TW_RM_RF_VAR                "tw_rm_rf"