Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d1fcca1 authored by Jorge Ruesga's avatar Jorge Ruesga Committed by Gerrit Code Review
Browse files

Merge "CMFM: Re-enable swipe to delete" into cm-10.2

parents be1aa63f 1621cdf3

res/xml/preferences_general.xml

+1 −3
Original line number Diff line number Diff line
@@ -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>

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

+5 −5
Original line number Diff line number Diff line
@@ -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 =