aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2014-08-19 14:33:27 -0700
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2014-08-26 22:33:15 +0000
commit11333b511c1670f2e6b63d96f746523fa1f85b8b (patch)
treef76297e680b4301b942db4c5f6655cdeeaf4059e
parent1e05f275a3f94c29620fa52ecdac7e187b2a454e (diff)
downloadandroid_packages_apps_CMFileManager-11333b511c1670f2e6b63d96f746523fa1f85b8b.tar.gz
android_packages_apps_CMFileManager-11333b511c1670f2e6b63d96f746523fa1f85b8b.tar.bz2
android_packages_apps_CMFileManager-11333b511c1670f2e6b63d96f746523fa1f85b8b.zip
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>
-rw-r--r--src/com/cyanogenmod/filemanager/activities/NavigationActivity.java2
-rw-r--r--src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index 8f5fcd26..97473c06 100644
--- 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 2821ce91..8c5c991e 100644
--- 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);
+ }
}
/**