Finish creating disable_free_space_check variable
* Create data manager variable for 'tw_disable_free_space'
* Make configurable through Settings
* Fix the "two presses needed to enable" issue for the checkbox on the
backup screen
* No need to capitalize every word, but do specify precedes backup
Change-Id: Id436cef13e4ca9349618420aac03862ec4e3c35e
diff --git a/data.cpp b/data.cpp
index 1ea7b84..81e9ca2 100644
--- a/data.cpp
+++ b/data.cpp
@@ -679,6 +679,7 @@
mPersist.SetValue(TW_REBOOT_AFTER_FLASH_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");
mPersist.SetValue(TW_USE_COMPRESSION_VAR, "0");
mPersist.SetValue(TW_TIME_ZONE_VAR, "CST6CDT,M3.2.0,M11.1.0");
mPersist.SetValue(TW_GUI_SORT_ORDER, "1");
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index a7a59d8..688cef2 100644
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -1605,7 +1605,7 @@
<checkbox>
<placement x="%col1_x_right%" y="%row9_y%"/>
- <text>{@disable_backup_space_chk=Disable Free Space Check}</text>
+ <text>{@disable_backup_space_chk=Disable free space check before backup}</text>
<data variable="tw_disable_free_space"/>
</checkbox>
@@ -2714,6 +2714,9 @@
<listitem name="{@use_rmrf_chk=Use rm -rf instead of formatting}">
<data variable="tw_rm_rf"/>
</listitem>
+ <listitem name="{@disable_backup_space_chk=Disable free space check before backup}">
+ <data variable="tw_disable_free_space"/>
+ </listitem>
<listitem name="{@skip_md5_backup_chk=Skip MD5 generation during backup}">
<data variable="tw_skip_md5_generate"/>
</listitem>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 2b80b25..28dbb6c 100644
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -208,7 +208,7 @@
<string name="enc_enabled">enabled</string>
<string name="enable_backup_comp_chk">Enable compression</string>
<string name="skip_md5_backup_chk">Skip MD5 generation during backup</string>
- <string name="disable_backup_space_chk">Disable Free Space Check</string>
+ <string name="disable_backup_space_chk" version="2">Disable free space check before backup</string>
<string name="refresh_sizes_btn">Refresh Sizes</string>
<string name="swipe_backup">Swipe to Backup</string>
<string name="append_date_btn">Append Date</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 6b74538..c3fe9ad 100644
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -1640,7 +1640,7 @@
<checkbox>
<placement x="%indent%" y="%row6a_y%"/>
- <text>{@disable_backup_space_chk=Disable Free Space Check}</text>
+ <text>{@disable_backup_space_chk=Disable free space check before backup}</text>
<data variable="tw_disable_free_space"/>
</checkbox>
@@ -2847,6 +2847,9 @@
<listitem name="{@use_rmrf_chk=Use rm -rf instead of formatting}">
<data variable="tw_rm_rf"/>
</listitem>
+ <listitem name="{@disable_backup_space_chk=Disable free space check before backup}">
+ <data variable="tw_disable_free_space"/>
+ </listitem>
<listitem name="{@skip_md5_backup_chk=Skip MD5 generation during backup}">
<data variable="tw_skip_md5_generate"/>
</listitem>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 38a2a23..fd60487 100644
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -1930,7 +1930,7 @@
<listitem name="{@skip_md5_backup_chk=Skip MD5 generation during backup}">
<data variable="tw_skip_md5_generate"/>
</listitem>
- <listitem name="{@disable_backup_space_chk=Disable Free Space Check}">
+ <listitem name="{@disable_backup_space_chk=Disable free space check before backup}">
<data variable="tw_disable_free_space"/>
</listitem>
</listbox>
@@ -2119,7 +2119,7 @@
<listitem name="{@skip_md5_backup_chk=Skip MD5 generation during backup}">
<data variable="tw_skip_md5_generate"/>
</listitem>
- <listitem name="{@disable_backup_space_chk=Disable Free Space Check}">
+ <listitem name="{@disable_backup_space_chk=Disable free space check before backup}">
<data variable="tw_disable_free_space"/>
</listitem>
</listbox>
@@ -3413,6 +3413,9 @@
<listitem name="{@use_rmrf_chk=Use rm -rf instead of formatting}">
<data variable="tw_rm_rf"/>
</listitem>
+ <listitem name="{@disable_backup_space_chk=Disable free space check before backup}">
+ <data variable="tw_disable_free_space"/>
+ </listitem>
<listitem name="{@skip_md5_backup_chk=Skip MD5 generation during backup}">
<data variable="tw_skip_md5_generate"/>
</listitem>
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 031cca0..a326d79 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -772,7 +772,7 @@
return false;
}
- DataManager::GetValue("tw_disable_free_space", disable_free_space_check);
+ DataManager::GetValue(TW_DISABLE_FREE_SPACE_VAR, disable_free_space_check);
if (adbbackup)
disable_free_space_check = true;
diff --git a/variables.h b/variables.h
index 1cfef08..5acae75 100644
--- a/variables.h
+++ b/variables.h
@@ -70,6 +70,7 @@
#define TW_FORCE_MD5_CHECK_VAR "tw_force_md5_check"
#define TW_SKIP_MD5_CHECK_VAR "tw_skip_md5_check"
#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_TIME_ZONE_VAR "tw_time_zone"