commit e7d8485a23def2f0670ba2813f5589cbef562d4d
author Amith Yamasani <yamasani@google.com> Tue Jan 07 10:42:15 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 07 10:42:15 2014 -0800
tree fc6f48b54cbf4abbd3f1e8d3ca35b7122fdb1696
parent 094de60467fc1cb2d2635a3a4aa82dff79d355fc
parent 5be77489e2f1f7b5c68763cf7660e844587d5e9e

am 5be77489: Merge "Dont show "Erase SD Card" when there is none"

* commit '5be77489e2f1f7b5c68763cf7660e844587d5e9e':
  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));
         }
     }