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

Commit fcb1fd76 authored by Luca Stefani's avatar Luca Stefani Committed by Dan Pasanen
Browse files

Settings: Remove our storage changes 

* Fixed in 7.1.1 merge:
  https://github.com/CyanogenMod/android_packages_apps_Settings/commit/454d7fcca892390e69e0c386a60ac6ea9fbd59f7

Change-Id: I62ebc9b1c0b507216ed4b8a61c19be8a5ad815b1
parent 8d44de3e

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

+1 −2
Original line number Diff line number Diff line
@@ -160,8 +160,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { 
        mVolume = mStorageManager.findVolumeById(mVolumeId);



        final long sharedDataSize = mVolume.getPath().getTotalSpace();

        boolean isInternal = VolumeInfo.ID_PRIVATE_INTERNAL.equals(mVolume.getId());

        mTotalSize = isInternal ? getArguments().getLong(EXTRA_VOLUME_SIZE, 0) : sharedDataSize;

        mTotalSize = getArguments().getLong(EXTRA_VOLUME_SIZE, 0);

        mSystemSize = mTotalSize - sharedDataSize;

        if (LOGV) Log.v(TAG,

                "onCreate() mTotalSize: " + mTotalSize + " sharedDataSize: " + sharedDataSize);

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

+1 −3
Original line number Diff line number Diff line
@@ -169,10 +169,8 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index 
            if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {

                final long volumeTotalBytes = getTotalSize(vol);

                final int color = COLOR_PRIVATE[privateCount++ % COLOR_PRIVATE.length];

                boolean isInternal = VolumeInfo.ID_PRIVATE_INTERNAL.equals(vol.getId());

                long size = isInternal ? volumeTotalBytes : vol.getPath().getTotalSpace();

                mInternalCategory.addPreference(

                        new StorageVolumePreference(context, vol, color, size));

                        new StorageVolumePreference(context, vol, color, volumeTotalBytes));

                if (vol.isMountedReadable()) {

                    final File path = vol.getPath();

                    privateUsedBytes += (volumeTotalBytes - path.getFreeSpace());