Merge "Update the Manage Storage preference."

This commit is contained in:
TreeHugger Robot
2017-03-10 22:01:57 +00:00
committed by Android (Google) Code Review
12 changed files with 303 additions and 222 deletions

View File

@@ -21,45 +21,38 @@
<com.android.settings.deviceinfo.storage.StorageSummaryDonutPreference
android:key="pref_summary"
android:order="0" />
<com.android.settings.widget.MasterSwitchPreference
android:fragment="com.android.settings.deletionhelper.AutomaticStorageManagerSettings"
android:key="toggle_asm"
android:title="@string/automatic_storage_manager_preference_title"
android:icon="@drawable/ic_settings_storage"
android:order="1" />
<com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
android:key="pref_photos_videos"
android:title="@string/storage_photos_videos"
android:order="1" >
</com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
android:order="2" />
<com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
android:key="pref_music_audio"
android:title="@string/storage_music_audio"
android:order="2" >
</com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
android:order="3" />
<com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
android:key="pref_games"
android:title="@string/storage_games"
android:order="3" >
</com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
android:order="4" />
<com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
android:key="pref_other_apps"
android:title="@string/storage_other_apps"
android:order="4" >
</com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
android:order="5" />
<com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
android:key="pref_files"
android:title="@string/storage_files"
android:order="5" >
</com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
android:order="6" />
<com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate
android:key="pref_system"
android:title="@string/storage_detail_system"
android:order="100" >
</com.android.settings.deviceinfo.storage.StorageItemPreferenceAlternate>
android:order="100" />
<PreferenceCategory
android:key="pref_secondary_users"
android:title="@string/storage_other_users"
android:order="200" />
<Preference
android:key="manage_storage"
android:title="@string/storage_menu_manage"
android:icon="@drawable/ic_settings_storage"
android:fragment="com.android.settings.deletionhelper.AutomaticStorageManagerSettings"
android:order="300" >
</Preference>
</PreferenceScreen>