PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the Manage Storage preference."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-10 22:01:57 +00:00
committed by Android (Google) Code Review
parent a540a978bc abd92e0519
commit f11c16710c
12 changed files with 303 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/layout/storage_summary_donut.xml
View File

@@ -56,15 +56,6 @@
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Body1" />
<TextView
android:id="@+id/storage_manager_indicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Body1"/>
<Button
android:id="@+id/deletion_helper_button"
android:layout_width="wrap_content"

24
res/values/strings.xml
View File

@@ -8251,18 +8251,6 @@
<!-- The percent of storage used by a storage volume. Exposed inside of a donut graph. [CHAR LIMIT=4]-->
<string name="storage_percent_used"><xliff:g id="percent" example="50%">%1$s</xliff:g>%%</string>
<!-- Indicates if the automatic storage manager is enabled or not. [CHAR_LIMIT=40] -->
<string name="storage_manager_indicator">Storage Manager: <xliff:g id="status" example="on">^1</xliff:g></string>
<!-- Off status for the automatic storage manager. [CHAR_LIMIT=10] -->
<string name="storage_manager_indicator_off">Off</string>
<!-- On status for the automatic storage manager. [CHAR_LIMIT=10] -->
<string name="storage_manager_indicator_on">On</string>
<!-- Added as the value of a header field indicating this is an instant app (as opposed to installed normally) -->
<string name="install_type_instant">Instant app</string>
<!-- Title of games app storage screen [CHAR LIMIT=30] -->
<string name="game_storage_settings">Games</string>
@@ -8291,4 +8279,16 @@
<!-- Temporary reboot string, will be removed -->
<string name="change_theme_reboot" translatable="false">Changing the theme requires a restart.</string>
<!-- Indicates if the automatic storage manager is enabled or not. [CHAR_LIMIT=40] -->
<string name="storage_manager_indicator">Storage Manager: <xliff:g id="status" example="on">^1</xliff:g></string>
<!-- Off status for the automatic storage manager. [CHAR_LIMIT=10] -->
<string name="storage_manager_indicator_off">Off</string>
<!-- On status for the automatic storage manager. [CHAR_LIMIT=10] -->
<string name="storage_manager_indicator_on">On</string>
<!-- Added as the value of a header field indicating this is an instant app (as opposed to installed normally) -->
<string name="install_type_instant">Instant app</string>
</resources>

31
res/xml/storage_dashboard_fragment.xml
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>