CMFileManager: remove access mode preference for user builds

For user (unrooted) builds, remove the access mode preference because it
is always disabled and misleading to the user.

Change-Id: I8be16109f98cc7c4230e936d9e7580d2d5c27f07
Signed-off-by: Roman Birg <roman@cyngn.com>

diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index 8f5fcd2..97473c0 100644 (file)
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -536,7 +536,7 @@ public class NavigationActivity extends Activity
                 ((Boolean)FileManagerSettings.SETTINGS_FIRST_USE.getDefaultValue()).booleanValue());
 
         //Display the welcome message?
-        if (firstUse) {
+        if (firstUse && !FileManagerApplication.isDeviceRooted()) {
             // open navigation drawer to show user that it exists
             mDrawerLayout.openDrawer(mDrawer);
 

diff --git a/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java b/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java
index 2821ce9..8c5c991 100644 (file)
--- a/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java
+++ b/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java
@@ -257,6 +257,11 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
         boolean restrictedAccess = AndroidHelper.isSecondaryUser(context) &&
                 FileManagerApplication.isRestrictSecondaryUsersAccess(context);
         this.mAccessMode.setEnabled(FileManagerApplication.isDeviceRooted() && !restrictedAccess);
+        if (!FileManagerApplication.isDeviceRooted()) {
+            PreferenceCategory category = (PreferenceCategory) findPreference(
+                    "general_advanced_settings");
+            category.removePreference(mAccessMode);
+        }
     }
 
     /**