Merge "Temporarily hiding enabling non-working functionality UI option for Froyo early droidfooders. Tracking issue in bug 2475355 Review Settings app options for non-working functionality."

1 files changed, 2 insertions, 3 deletions

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 5b60c459c..9f99824e2 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -235,9 +235,8 @@ public class SecuritySettings extends PreferenceActivity {
         // File System Encryption
         PreferenceCategory encryptedfsCat = new PreferenceCategory(this);
         encryptedfsCat.setTitle(R.string.encrypted_fs_category);
-        root.addPreference(encryptedfsCat);
+        //root.addPreference(encryptedfsCat);
         mCredentialStorage.createPreferences(encryptedfsCat, CredentialStorage.TYPE_ENCRYPTEDFS);
-
         return root;
     }
 
@@ -622,7 +621,7 @@ public class SecuritySettings extends PreferenceActivity {
                 mEncryptedFSEnabled.setTitle(R.string.encrypted_fs_enable);
                 mEncryptedFSEnabled.setSummary(R.string.encrypted_fs_enable_summary);
                 mEncryptedFSEnabled.setOnPreferenceChangeListener(this);
-                category.addPreference(mEncryptedFSEnabled);
+                // category.addPreference(mEncryptedFSEnabled);
                 break;
             }
         }