Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Split System category" into main

Browse Source
This commit is contained in:
Aleksandr Lukin
2024-04-04 15:25:15 +00:00
committed by Android (Google) Code Review
parent 2f8efa0633 f4329ada00
commit 80d12dbc25
10 changed files with 201 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/xml/storage_category_fragment.xml
View File

@@ -61,19 +61,31 @@
android:title="@string/storage_documents_and_other"
android:icon="@drawable/ic_folder_vd_theme_24"
android:order="106"/>
<com.android.settings.deviceinfo.StorageItemPreference
android:key="pref_system"
android:title="@string/storage_system"
android:icon="@drawable/ic_system_update"
android:order="107"/>
<com.android.settings.deviceinfo.StorageItemPreference
android:key="pref_trash"
android:title="@string/storage_trash"
android:icon="@drawable/ic_trash_can"
android:order="108"/>
<!-- Preference order 100~200 are 'ONLY' for storage category preferences above. -->
android:order="107"/>
<!-- Preference order 100~200 are 'ONLY' for storage category
preferences that are sorted by size. -->
<PreferenceCategory
android:key="storage_category_splitter"
android:title="@string/storage_system_label"
android:order="201"
settings:searchable="false">
<com.android.settings.deviceinfo.StorageItemPreference
android:key="pref_system"
android:title="@string/storage_os_name"
android:icon="@drawable/ic_android_vd_theme_24"
android:order="202"/>
<com.android.settings.deviceinfo.StorageItemPreference
android:key="temporary_files"
android:title="@string/storage_temporary_files"
android:icon="@drawable/ic_database_vd_theme_24"
android:order="203"/>
</PreferenceCategory>
<PreferenceCategory
android:key="pref_non_current_users"
android:title="@string/storage_other_users"
android:order="201" />
android:order="204" />
</PreferenceScreen>

28
res/xml/storage_dashboard_fragment.xml
View File

@@ -80,19 +80,31 @@
android:title="@string/storage_documents_and_other"
android:icon="@drawable/ic_folder_vd_theme_24"
android:order="106"/>
<com.android.settings.deviceinfo.StorageItemPreference
android:key="pref_system"
android:title="@string/storage_system"
android:icon="@drawable/ic_system_update"
android:order="107"/>
<com.android.settings.deviceinfo.StorageItemPreference
android:key="pref_trash"
android:title="@string/storage_trash"
android:icon="@drawable/ic_trash_can"
android:order="108"/>
<!-- Preference order 100~200 are 'ONLY' for storage category preferences above. -->
android:order="107"/>
<!-- Preference order 100~200 are 'ONLY' for storage category
preferences that are sorted by size. -->
<PreferenceCategory
android:key="storage_category_splitter"
android:title="@string/storage_system_label"
android:order="201"
settings:searchable="false">
<com.android.settings.deviceinfo.StorageItemPreference
android:key="pref_system"
android:title="@string/storage_os_name"
android:icon="@drawable/ic_android_vd_theme_24"
android:order="202"/>
<com.android.settings.deviceinfo.StorageItemPreference
android:key="temporary_files"
android:title="@string/storage_temporary_files"
android:icon="@drawable/ic_database_vd_theme_24"
android:order="203"/>
</PreferenceCategory>
<PreferenceCategory
android:key="pref_non_current_users"
android:title="@string/storage_other_users"
android:order="201" />
android:order="204" />
</PreferenceScreen>