CMFM: Move hidden/folder/system/symlink settings into settings (7f2dd4a0) · Commits · e / os / android_packages_apps_CMFileManager

res/layout/sort_view_options.xml

+2 −4

Original line number	Diff line number	Diff line
		@@ -13,8 +13,7 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<com.cyanogenmod.filemanager.dialogs.SortViewOptions
		xmlns:android="http://schemas.android.com/apk/res/android"
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		@@ -68,5 +67,4 @@
		android:layout_height="80dp"
		layout="@layout/sort_item" />
		</LinearLayout>

		</com.cyanogenmod.filemanager.dialogs.SortViewOptions>
		No newline at end of file
		</LinearLayout>

res/values/strings.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -890,7 +890,6 @@

		<string name="activity_not_found_exception">Couldn\'t find an app to open this file</string>


		<string name="add_cloud_storage">Add cloud storage</string>
		<string name="add_cloud_storage_desc">Important files are a tap away when you link cloud storage to your device. Tap here to set up.</string>
		<string name="oobe_add_cloud_storage_desc">Important files are a tap away when you link cloud storage to your device.</string>
		@@ -899,5 +898,5 @@
		<string name="manager">Manager</string>
		<string name="welcome_desc">Simple, powerful access to all your data from anywhere.</string>


		<string name="safe_mode_not_allowed">Setting not available in safe mode</string>
		</resources>

res/xml/preferences_general.xml

+27 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,33 @@
		android:persistent="true"
		android:defaultValue="false" />

		<SwitchPreference
		android:key="cm_filemanager_show_dirs_first"
		android:title="@string/cm_filemanager_show_dirs_first"
		android:persistent="true"
		android:defaultValue="true" />

		<SwitchPreference
		android:key="cm_filemanager_show_hidden"
		android:title="@string/cm_filemanager_show_hidden"
		android:summary="@string/safe_mode_not_allowed"
		android:persistent="true"
		android:defaultValue="true" />

		<SwitchPreference
		android:key="cm_filemanager_show_system"
		android:title="@string/cm_filemanager_show_system"
		android:summary="@string/safe_mode_not_allowed"
		android:persistent="true"
		android:defaultValue="true" />

		<SwitchPreference
		android:key="cm_filemanager_show_symlinks"
		android:title="@string/cm_filemanager_show_symlinks"
		android:summary="@string/safe_mode_not_allowed"
		android:persistent="true"
		android:defaultValue="true" />

		</PreferenceCategory>

		<!-- Advanced settings -->

src/com/cyanogenmod/filemanager/activities/MainActivity.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ import com.cyanogenmod.filemanager.dialogs.SortViewOptions;
		import com.cyanogenmod.filemanager.model.Bookmark;
		import com.cyanogenmod.filemanager.model.FileSystemObject;
		import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
		import com.cyanogenmod.filemanager.preferences.PreferenceHelper;
		import com.cyanogenmod.filemanager.preferences.Preferences;
		import com.cyanogenmod.filemanager.ui.fragments.HomeFragment;
		import com.cyanogenmod.filemanager.ui.fragments.LoginFragment;
		@@ -374,16 +375,19 @@ public class MainActivity extends ActionBarActivity
		//Navigation view options
		//######################
		case com.cyanogenmod.filemanager.R.id.ab_sort_mode:
		DialogHelper.createSortDialog(this,
		SortViewOptions.createSortDialog(this,
		FileManagerSettings.SETTINGS_SORT_MODE,
		new SortViewOptions.OnClickListener() {
		@Override
		public void onClick(DialogInterface dialog, int which, int result) {
		if (which == DialogInterface.BUTTON_POSITIVE) {
		if (PreferenceHelper.getIntPreference(
		FileManagerSettings.SETTINGS_SORT_MODE) != result) {
		((NavigationFragment) currentFragment).updateSetting(
		FileManagerSettings.SETTINGS_SORT_MODE, result);
		}
		}
		}
		})
		.show();
		break;

src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java

+27 −20

Original line number	Diff line number	Diff line
		@@ -50,9 +50,6 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
		private SwitchPreference mCaseSensitiveSort;
		private ListPreference mFiletimeFormatMode;
		private ListPreference mFreeDiskSpaceWarningLevel;
		private SwitchPreference mComputeFolderStatistics;
		private SwitchPreference mDisplayThumbs;
		private SwitchPreference mUseFlinger;
		private ListPreference mAccessMode;
		private SwitchPreference mRestrictSecondaryUsersAccess;
		private SwitchPreference mDebugTraces;
		@@ -132,6 +129,8 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
		String[] summary = getResources().getStringArray(
		R.array.access_mode_summaries);
		preference.setSummary(summary[valueId]);

		updateAccessModePreferences(newMode.compareTo(AccessMode.SAFE) == 0);
		}

		// Restricted secondary users access
		@@ -203,23 +202,20 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
		this.mOnChangeListener.onPreferenceChange(this.mFreeDiskSpaceWarningLevel, value);
		this.mFreeDiskSpaceWarningLevel.setOnPreferenceChangeListener(this.mOnChangeListener);

		// Compute folder statistics
		this.mComputeFolderStatistics =
		(SwitchPreference)findPreference(
		FileManagerSettings.SETTINGS_COMPUTE_FOLDER_STATISTICS.getId());
		this.mComputeFolderStatistics.setOnPreferenceChangeListener(this.mOnChangeListener);

		// Display thumbs
		this.mDisplayThumbs =
		(SwitchPreference)findPreference(
		FileManagerSettings.SETTINGS_DISPLAY_THUMBS.getId());
		this.mDisplayThumbs.setOnPreferenceChangeListener(this.mOnChangeListener);
		FileManagerSettings[] switchSettings = new FileManagerSettings[] {
		FileManagerSettings.SETTINGS_COMPUTE_FOLDER_STATISTICS,
		FileManagerSettings.SETTINGS_DISPLAY_THUMBS,
		FileManagerSettings.SETTINGS_USE_FLINGER,
		FileManagerSettings.SETTINGS_SHOW_DIRS_FIRST,
		FileManagerSettings.SETTINGS_SHOW_HIDDEN,
		FileManagerSettings.SETTINGS_SHOW_SYSTEM,
		FileManagerSettings.SETTINGS_SHOW_SYMLINKS,
		};

		// Use flinger
		this.mUseFlinger =
		(SwitchPreference)findPreference(
		FileManagerSettings.SETTINGS_USE_FLINGER.getId());
		this.mUseFlinger.setOnPreferenceChangeListener(this.mOnChangeListener);
		for (FileManagerSettings switchSetting : switchSettings) {
		findPreference(switchSetting.getId())
		.setOnPreferenceChangeListener(this.mOnChangeListener);
		}

		// Access mode
		this.mAccessMode =
		@@ -274,6 +270,17 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
		}
		}

		private void updateAccessModePreferences(boolean safeMode) {
		FileManagerSettings[] rootSettings = new FileManagerSettings[] {
		FileManagerSettings.SETTINGS_SHOW_HIDDEN,
		FileManagerSettings.SETTINGS_SHOW_SYSTEM,
		FileManagerSettings.SETTINGS_SHOW_SYMLINKS,
		};
		for (FileManagerSettings setting : rootSettings) {
		findPreference(setting.getId()).setEnabled(!safeMode);
		}
		}

		/**
		* {@inheritDoc}
		*/