commit 3cfb676758b5ec44100a0a8cd47f1c4a7a615775
author Amith Yamasani <yamasani@google.com> Tue Jan 07 18:45:23 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 07 18:45:23 2014 +0000
tree fc6f48b54cbf4abbd3f1e8d3ca35b7122fdb1696
parent 2659aeb1fae6cb031647321df59ad9bbff86847e
parent e7d8485a23def2f0670ba2813f5589cbef562d4d

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

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