Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d040e55 authored by Daniel Nishi's avatar Daniel Nishi Committed by Android (Google) Code Review
Browse files

Merge "Show storage manager settings using a system property." into nyc-mr1-dev

parents 0a13cfbf 00748552

res/values/bools.xml

+0 −3
Original line number Diff line number Diff line
@@ -41,9 +41,6 @@ 
    <!-- Whether none security option is hide or not  (country specific). -->

    <bool name="config_hide_none_security_option">false</bool>



    <!--Whether the storage manager exists. -->

    <bool name="config_has_storage_manager">false</bool>



    <!-- Whether the automatic storage management job should be scheduled. -->

    <bool name="enable_automatic_storage_management">false</bool>

</resources>

src/com/android/settings/deviceinfo/PrivateVolumeSettings.java

+5 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 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;
@@ -92,6 +93,8 @@ 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,
@@ -212,7 +215,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { 


        screen.removeAll();



        if (getResources().getBoolean(R.bool.config_has_storage_manager)) {

        if (SystemProperties.getBoolean(STORAGE_MANAGER_PROPERTY, false)) {

            addPreference(screen, mAutomaticStorageManagement);

        }

        addPreference(screen, mSummary);
@@ -396,7 +399,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { 
            mount.setVisible(false);

            unmount.setVisible(false);

            format.setVisible(false);

            manage.setVisible(getResources().getBoolean(R.bool.config_has_storage_manager));

            manage.setVisible(SystemProperties.getBoolean(STORAGE_MANAGER_PROPERTY, false));

        } else {

            rename.setVisible(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);

            mount.setVisible(mVolume.getState() == VolumeInfo.STATE_UNMOUNTED);