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

Use a config flag instead of a RO flag for showing Manage Storage.

Browse Source 
Bug: 30455784
Test: make SettingsTests; run the instrumentation.
Change-Id: I860192c1c20fcaec2a5cbcdc085ff01dafa7351a
(cherry picked from commit 7f075a3c41)
This commit is contained in:
Daniel Nishi
2016-09-08 17:24:50 -07:00
parent a365d9123c
commit c0b33f70ed
3 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
View File

@@ -30,7 +30,6 @@ import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.os.Bundle;
import android.os.Environment;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.storage.StorageEventListener;
@@ -93,8 +92,6 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
private static final String STORAGE_MANAGER_PROPERTY = "ro.storage_manager.enabled";
private static final int[] ITEMS_NO_SHOW_SHARED = new int[] {
R.string.storage_detail_apps,
R.string.storage_detail_system,
@@ -218,7 +215,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
screen.removeAll();
if (SystemProperties.getBoolean(STORAGE_MANAGER_PROPERTY, false)) {
if (getResources().getBoolean(R.bool.config_storage_manager_settings_enabled)) {
addPreference(screen, mAutomaticStorageManagement);
}
addPreference(screen, mSummary);
@@ -410,7 +407,8 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
mount.setVisible(false);
unmount.setVisible(false);
format.setVisible(false);
manage.setVisible(SystemProperties.getBoolean(STORAGE_MANAGER_PROPERTY, false));
manage.setVisible(getResources().getBoolean(
R.bool.config_storage_manager_settings_enabled));
} else {
rename.setVisible(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);
mount.setVisible(mVolume.getState() == VolumeInfo.STATE_UNMOUNTED);