diff options
| author | Jorge Ruesga <jorge@ruesga.com> | 2013-11-15 20:15:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-11-15 20:15:16 +0000 |
| commit | 2d1fcca14cafde8a2908022d75b77d74b5c7b630 (patch) | |
| tree | 83727c1a1ccfa8e4719758fcb2814b421f394d6f | |
| parent | be1aa63ff081c1cd9bb86a8592b8f61c960ec6f7 (diff) | |
| parent | 1621cdf34fe5fd27399a4fd85388b1b99e82cc50 (diff) | |
| download | android_packages_apps_CMFileManager-2d1fcca14cafde8a2908022d75b77d74b5c7b630.tar.gz android_packages_apps_CMFileManager-2d1fcca14cafde8a2908022d75b77d74b5c7b630.tar.bz2 android_packages_apps_CMFileManager-2d1fcca14cafde8a2908022d75b77d74b5c7b630.zip | |
Merge "CMFM: Re-enable swipe to delete" into cm-10.2
| -rw-r--r-- | res/xml/preferences_general.xml | 4 | ||||
| -rw-r--r-- | src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/res/xml/preferences_general.xml b/res/xml/preferences_general.xml index 08982953..2bfbf09c 100644 --- a/res/xml/preferences_general.xml +++ b/res/xml/preferences_general.xml @@ -65,14 +65,12 @@ android:defaultValue="false" /> <!-- Use flinger --> - <!-- <CheckBoxPreference android:key="cm_filemanager_use_flinger" android:title="@string/pref_use_flinger" android:summary="@string/pref_use_flinger_summary" android:persistent="true" - android:defaultValue="true" /> - --> + android:defaultValue="false" /> </PreferenceCategory> diff --git a/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java b/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java index 16e3eabf..f4643907 100644 --- a/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java +++ b/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java @@ -48,7 +48,7 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment { private ListPreference mFreeDiskSpaceWarningLevel; private CheckBoxPreference mComputeFolderStatistics; private CheckBoxPreference mDisplayThumbs; -// private CheckBoxPreference mUseFlinger; + private CheckBoxPreference mUseFlinger; private ListPreference mAccessMode; private CheckBoxPreference mDebugTraces; @@ -190,10 +190,10 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment { this.mDisplayThumbs.setOnPreferenceChangeListener(this.mOnChangeListener); // Use flinger -// this.mUseFlinger = -// (CheckBoxPreference)findPreference( -// FileManagerSettings.SETTINGS_USE_FLINGER.getId()); -// this.mUseFlinger.setOnPreferenceChangeListener(this.mOnChangeListener); + this.mUseFlinger = + (CheckBoxPreference)findPreference( + FileManagerSettings.SETTINGS_USE_FLINGER.getId()); + this.mUseFlinger.setOnPreferenceChangeListener(this.mOnChangeListener); // Access mode this.mAccessMode = |