diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2015-12-10 17:19:45 +0100 |
|---|---|---|
| committer | Dees Troy <dees_troy@teamw.in> | 2016-01-25 23:59:17 +0100 |
| commit | 66a1949df91cc558bf5573c395fa9084c1365e81 (patch) | |
| tree | 2a2e3c959e8f19f2489bc19f86df6e5a6caa1ccf /gui | |
| parent | gui: add icons on settings tabs (diff) | |
| download | android_bootable_recovery-66a1949df91cc558bf5573c395fa9084c1365e81.tar android_bootable_recovery-66a1949df91cc558bf5573c395fa9084c1365e81.tar.gz android_bootable_recovery-66a1949df91cc558bf5573c395fa9084c1365e81.tar.bz2 android_bootable_recovery-66a1949df91cc558bf5573c395fa9084c1365e81.tar.lz android_bootable_recovery-66a1949df91cc558bf5573c395fa9084c1365e81.tar.xz android_bootable_recovery-66a1949df91cc558bf5573c395fa9084c1365e81.tar.zst android_bootable_recovery-66a1949df91cc558bf5573c395fa9084c1365e81.zip | |
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/action.cpp | 1 | ||||
| -rwxr-xr-x | gui/theme/common/landscape.xml | 6 | ||||
| -rwxr-xr-x | gui/theme/common/languages/en.xml | 1 | ||||
| -rwxr-xr-x | gui/theme/common/portrait.xml | 6 |
4 files changed, 14 insertions, 0 deletions
diff --git a/gui/action.cpp b/gui/action.cpp index 711f64506..8895e4013 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -1466,6 +1466,7 @@ int GUIAction::decrypt(std::string arg __unused) LOGINFO("Got default contexts and file mode for storage files.\n"); } } + PartitionManager.Decrypt_Adopted(); } } diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml index ff6babe1c..a6b5dca4c 100755 --- a/gui/theme/common/landscape.xml +++ b/gui/theme/common/landscape.xml @@ -1120,6 +1120,12 @@ <text>{@format_data_lcp2=removes encryption on internal storage.}</text> </text> + <text style="text_m_fail"> + <condition var1="tw_has_adopted_storage" var2="1"/> + <placement x="%center_x%" y="%row4_y%" placement="5"/> + <text>{@format_data_adopted=Including Adopted Storage}</text> + </text> + <text style="text_m"> <placement x="%center_x%" y="%row5_y%" placement="5"/> <text>{@format_data_undo=This cannot be undone.}</text> diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml index 5d7a5ac03..8b36ccfc0 100755 --- a/gui/theme/common/languages/en.xml +++ b/gui/theme/common/languages/en.xml @@ -143,6 +143,7 @@ <string name="format_data_ptr1">Format Data will wipe all of your apps,</string> <string name="format_data_ptr2">backups, pictures, videos, media, and</string> <string name="format_data_ptr3">removes encryption on internal storage.</string> + <string name="format_data_adopted">Including Adopted Storage</string> <string name="format_data_lcp1">Format Data will wipe all of your apps, backups, pictures, videos, media, and</string> <string name="format_data_lcp2">removes encryption on internal storage.</string> <string name="format_data_wtc1">Format Data will wipe all of your apps,</string> diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml index 03004aeff..0904c7254 100755 --- a/gui/theme/common/portrait.xml +++ b/gui/theme/common/portrait.xml @@ -1077,6 +1077,12 @@ <text>{@format_data_ptr3=removes encryption on internal storage.}</text> </text> + <text style="text_m_fail"> + <condition var1="tw_has_adopted_storage" var2="1"/> + <placement x="%center_x%" y="%row5_y%" placement="5"/> + <text>{@format_data_adopted=Including Adopted Storage}</text> + </text> + <text style="text_m"> <placement x="%center_x%" y="%row6_y%" placement="5"/> <text>{@format_data_undo=This cannot be undone.}</text> |