commit ecc1730a9ca968bd16cf1e16e819ffd0d43c4321
author Amith Yamasani <yamasani@google.com> Tue Jan 07 19:23:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 07 19:23:09 2014 +0000
tree 51dea067c4db6dd3dcafece3df46cd8a6700752b
parent becfb95248d6f2b0a216930acc67ef460a262831
parent 200b6c63237bcf1d911d5e8b48a4cd2f05d0ce3d

am 200b6c63: am 3cfb6767: am e7d8485a: am 5be77489: Merge "Dont show "Erase SD Card" when there is none"

* commit '200b6c63237bcf1d911d5e8b48a4cd2f05d0ce3d':
  Dont show "Erase SD Card" when there is none

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

diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
index ed5085a..29b1e92 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
@@ -283,7 +283,7 @@
                 mFormatPreference.setSummary(mResources.getString(R.string.mtp_ptp_mode_summary));
             }
         } else if (mFormatPreference != null) {
-            mFormatPreference.setEnabled(true);
+            mFormatPreference.setEnabled(mMountTogglePreference.isEnabled());
             mFormatPreference.setSummary(mResources.getString(R.string.sd_format_summary));
         }
     }