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
This commit is contained in:
Matt Mower
2016-04-25 23:22:31 -05:00
committed by Ethan Yonker
parent 9fa76ba147
commit bfccfb8822
7 changed files with 17 additions and 6 deletions
+1
View File
@@ -679,6 +679,7 @@ void DataManager::SetDefaultValues()
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");
+4 -1
View File
@@ -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>
+1 -1
View File
@@ -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>
+4 -1
View File
@@ -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>
+5 -2
View File
@@ -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>
+1 -1
View File
@@ -772,7 +772,7 @@ int TWPartitionManager::Run_Backup(bool adbbackup) {
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;
+1
View File
@@ -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"