Support .img.tar format for ODIN

This commit is contained in:
topjohnwu
2017-09-03 17:24:05 +08:00
parent d4a10e2873
commit 04a589722c
7 changed files with 97 additions and 13 deletions
+5
View File
@@ -77,4 +77,9 @@
<item>@string/settings_update_beta</item>
</string-array>
<string-array name="boot_formats">
<item>.img</item>
<item>.img.tar</item>
</string-array>
</resources>
+3
View File
@@ -156,9 +156,12 @@
<string name="settings_hide_manager_summary">Temporarily hide Magisk Manager.\nThis will install a new app called \"Unhide Magisk Manager\"</string>
<string name="language">Language</string>
<string name="system_default">(System Default)</string>
<string name="settings_update">Update Settings</string>
<string name="settings_update_channel_title">Update Channel</string>
<string name="settings_update_stable">Stable</string>
<string name="settings_update_beta">Beta</string>
<string name="settings_boot_format_title">Patched Boot Output File Format</string>
<string name="settings_boot_format_summary">Select the output file format of the patched boot image\nChoose .img to flash through fastboot/download mode\nChoose .img.tar to flash with ODIN</string>
<string name="settings_core_only_title">Magisk Core Only Mode</string>
<string name="settings_core_only_summary">Enable only core features, all modules will not be loaded. MagiskSU, MagiskHide, and systemless hosts will still be enabled</string>
+22 -9
View File
@@ -10,6 +10,22 @@
android:title="@string/settings_dark_theme_title"
android:summary="@string/settings_dark_theme_summary" />
<Preference
android:key="clear"
android:title="@string/settings_clear_cache_title"
android:summary="@string/settings_clear_cache_summary" />
<Preference
android:key="hide"
android:title="@string/settings_hide_manager_title"
android:summary="@string/settings_hide_manager_summary" />
</PreferenceCategory>
<PreferenceCategory
android:key="update"
android:title="@string/settings_update">
<SwitchPreference
android:key="notification"
android:title="@string/settings_notification_title"
@@ -21,15 +37,12 @@
android:entries="@array/update_channel"
android:entryValues="@array/value_array" />
<Preference
android:key="clear"
android:title="@string/settings_clear_cache_title"
android:summary="@string/settings_clear_cache_summary" />
<Preference
android:key="hide"
android:title="@string/settings_hide_manager_title"
android:summary="@string/settings_hide_manager_summary" />
<ListPreference
android:key="boot_format"
android:title="@string/settings_boot_format_title"
android:entries="@array/boot_formats"
android:entryValues="@array/boot_formats"
android:summary="@string/settings_boot_format_summary"/>
</PreferenceCategory>