CMFileManager : Settings - Checkbox to Switches

As recommended: http://developer.android.com/design/building-blocks/switches.html
This also adds some more design consistency.

Change-Id: I59bb3fc3499a3f782934cdd6c8ec5529cfd21e12

diff --git a/res/xml/preferences_editor.xml b/res/xml/preferences_editor.xml
index 350aa95..a6415be 100644 (file)
--- a/res/xml/preferences_editor.xml
+++ b/res/xml/preferences_editor.xml
@@ -23,7 +23,7 @@
       android:title="@string/pref_editor_behaviour_category">
 
       <!-- No suggestions -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_editor_no_suggestions"
         android:title="@string/pref_no_suggestions"
         android:summary="@string/pref_no_suggestions_desc"
@@ -31,14 +31,14 @@
         android:defaultValue="false" />
 
       <!-- Word wrap -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_editor_word_wrap"
         android:title="@string/pref_word_wrap"
         android:persistent="true"
         android:defaultValue="true" />
 
       <!-- Hexdump -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_editor_hexdump"
         android:title="@string/pref_hexdump"
         android:summary="@string/pref_hexdump_desc"
@@ -53,7 +53,7 @@
       android:title="@string/pref_editor_syntax_highlight_category">
 
       <!-- Syntax highlight -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_editor_syntax_highlight"
         android:title="@string/pref_syntax_highlight"
         android:summary="@string/pref_syntax_highlight_desc"

diff --git a/res/xml/preferences_editor_color_scheme.xml b/res/xml/preferences_editor_color_scheme.xml
index 6edd0e4..ef06936 100644 (file)
--- a/res/xml/preferences_editor_color_scheme.xml
+++ b/res/xml/preferences_editor_color_scheme.xml
@@ -18,7 +18,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Use default theme color scheme -->
-    <CheckBoxPreference
+    <SwitchPreference
       android:key="cm_filemanager_editor_sh_use_theme_default"
       android:title="@string/pref_syntax_sh_use_theme_default"
       android:summary="@string/pref_syntax_sh_use_theme_default_desc"

diff --git a/res/xml/preferences_general.xml b/res/xml/preferences_general.xml
index 07316ea..961ac95 100644 (file)
--- a/res/xml/preferences_general.xml
+++ b/res/xml/preferences_general.xml
@@ -23,7 +23,7 @@
       android:title="@string/pref_general_behaviour_category">
 
       <!-- Case sensitive order -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_case_sensitive_sort"
         android:title="@string/pref_case_sensitive_sort"
         android:summary="@string/pref_case_sensitive_sort_summary"
@@ -49,7 +49,7 @@
         android:persistent="true" />
 
       <!-- Compute folder statistics -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_compute_folder_statistics"
         android:title="@string/pref_compute_folder_statistics"
         android:summaryOn="@string/pref_compute_folder_statistics_on"
@@ -57,7 +57,7 @@
         android:defaultValue="false" />
 
       <!-- Thumbs -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_show_thumbs"
         android:title="@string/pref_display_thumbs"
         android:summary="@string/pref_display_thumbs_summary"
@@ -65,7 +65,7 @@
         android:defaultValue="false" />
 
       <!-- Use flinger -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_use_flinger"
         android:title="@string/pref_use_flinger"
         android:summary="@string/pref_use_flinger_summary"
@@ -89,7 +89,7 @@
         android:persistent="true" />
 
       <!-- Restrict secondary users access -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_restrict_secondary_users_access"
         android:title="@string/pref_restrict_secondary_users_access_title"
         android:summary="@string/pref_restrict_secondary_users_access_summary"
@@ -97,7 +97,7 @@
         android:defaultValue="false" />
 
       <!-- Capture debug traces -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_show_debug_traces"
         android:title="@string/pref_debug_traces"
         android:persistent="true"

diff --git a/res/xml/preferences_search.xml b/res/xml/preferences_search.xml
index 9bbdea7..cef8673 100644 (file)
--- a/res/xml/preferences_search.xml
+++ b/res/xml/preferences_search.xml
@@ -23,14 +23,14 @@
       android:title="@string/pref_search_results_category">
 
       <!-- Highlight search terms -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_highlight_terms"
         android:title="@string/pref_highlight_terms"
         android:persistent="true"
         android:defaultValue="true" />
 
       <!-- Relevance widget -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_show_relevance_widget"
         android:title="@string/pref_show_relevance_widget"
         android:persistent="true"
@@ -53,7 +53,7 @@
       android:title="@string/pref_search_privacity_category">
 
       <!-- Save search terms -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_save_search_terms"
         android:title="@string/pref_save_search_terms"
         android:summaryOn="@string/pref_save_search_terms_on"

diff --git a/res/xml/preferences_storage.xml b/res/xml/preferences_storage.xml
index 47f27ee..c53f188 100644 (file)
--- a/res/xml/preferences_storage.xml
+++ b/res/xml/preferences_storage.xml
@@ -33,7 +33,7 @@
         android:title="@string/pref_secure_storage_delete_storage_title"/>
 
       <!-- Delayed synchronization -->
-      <CheckBoxPreference
+      <SwitchPreference
         android:key="cm_filemanager_secure_storage_delayed_sync"
         android:title="@string/pref_secure_storage_delayed_sync_title"
         android:summary="@string/pref_secure_storage_delayed_sync_summary"

diff --git a/src/com/cyanogenmod/filemanager/activities/preferences/EditorPreferenceFragment.java b/src/com/cyanogenmod/filemanager/activities/preferences/EditorPreferenceFragment.java
index 03836c5..5ff3552 100644 (file)
--- a/src/com/cyanogenmod/filemanager/activities/preferences/EditorPreferenceFragment.java
+++ b/src/com/cyanogenmod/filemanager/activities/preferences/EditorPreferenceFragment.java
@@ -19,9 +19,9 @@ package com.cyanogenmod.filemanager.activities.preferences;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.SwitchPreference;
 import android.util.Log;
 
 import com.cyanogenmod.filemanager.R;
@@ -37,11 +37,11 @@ public class EditorPreferenceFragment extends TitlePreferenceFragment {
 
     private static final boolean DEBUG = false;
 
-    private CheckBoxPreference mNoSuggestions;
-    private CheckBoxPreference mWordWrap;
-    private CheckBoxPreference mHexdump;
+    private SwitchPreference mNoSuggestions;
+    private SwitchPreference mWordWrap;
+    private SwitchPreference mHexdump;
 
-    private CheckBoxPreference mSyntaxHighlight;
+    private SwitchPreference mSyntaxHighlight;
 
 
     /**
@@ -93,25 +93,25 @@ public class EditorPreferenceFragment extends TitlePreferenceFragment {
 
         // No suggestions
         this.mNoSuggestions =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_EDITOR_NO_SUGGESTIONS.getId());
         this.mNoSuggestions.setOnPreferenceChangeListener(this.mOnChangeListener);
 
         // WordWrap
         this.mWordWrap =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_EDITOR_WORD_WRAP.getId());
         this.mWordWrap.setOnPreferenceChangeListener(this.mOnChangeListener);
 
         // Hexdump
         this.mHexdump =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_EDITOR_HEXDUMP.getId());
         this.mHexdump.setOnPreferenceChangeListener(this.mOnChangeListener);
 
         // Syntax highlight
         this.mSyntaxHighlight =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_EDITOR_SYNTAX_HIGHLIGHT.getId());
         this.mSyntaxHighlight.setOnPreferenceChangeListener(this.mOnChangeListener);
 

diff --git a/src/com/cyanogenmod/filemanager/activities/preferences/EditorSHColorSchemePreferenceFragment.java b/src/com/cyanogenmod/filemanager/activities/preferences/EditorSHColorSchemePreferenceFragment.java
index 4dbabab..e2b8f15 100644 (file)
--- a/src/com/cyanogenmod/filemanager/activities/preferences/EditorSHColorSchemePreferenceFragment.java
+++ b/src/com/cyanogenmod/filemanager/activities/preferences/EditorSHColorSchemePreferenceFragment.java
@@ -19,10 +19,10 @@ package com.cyanogenmod.filemanager.activities.preferences;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.SwitchPreference;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -45,7 +45,7 @@ public class EditorSHColorSchemePreferenceFragment extends TitlePreferenceFragme
 
     private static final String KEY_RESET_COLOR_SCHEME = "ash_reset_color_scheme"; //$NON-NLS-1$
 
-    private CheckBoxPreference mUseThemeDefault;
+    private SwitchPreference mUseThemeDefault;
     private Preference mResetColorScheme;
     private ColorPickerPreference[] mColorScheme;
 
@@ -136,7 +136,7 @@ public class EditorSHColorSchemePreferenceFragment extends TitlePreferenceFragme
 
         // Use Theme default
         this.mUseThemeDefault =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_EDITOR_SH_USE_THEME_DEFAULT.getId());
         Boolean defaultValue = ((Boolean)FileManagerSettings.
                 SETTINGS_EDITOR_SH_USE_THEME_DEFAULT.getDefaultValue());

diff --git a/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java b/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java
index e578dc6..e66272a 100644 (file)
--- a/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java
+++ b/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java
@@ -20,11 +20,11 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.SwitchPreference;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -47,15 +47,15 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
 
     private static final boolean DEBUG = false;
 
-    private CheckBoxPreference mCaseSensitiveSort;
+    private SwitchPreference mCaseSensitiveSort;
     private ListPreference mFiletimeFormatMode;
     private ListPreference mFreeDiskSpaceWarningLevel;
-    private CheckBoxPreference mComputeFolderStatistics;
-    private CheckBoxPreference mDisplayThumbs;
-    private CheckBoxPreference mUseFlinger;
+    private SwitchPreference mComputeFolderStatistics;
+    private SwitchPreference mDisplayThumbs;
+    private SwitchPreference mUseFlinger;
     private ListPreference mAccessMode;
-    private CheckBoxPreference mRestrictSecondaryUsersAccess;
-    private CheckBoxPreference mDebugTraces;
+    private SwitchPreference mRestrictSecondaryUsersAccess;
+    private SwitchPreference mDebugTraces;
 
     /**
      * @hide
@@ -139,7 +139,7 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
                     compareTo(key) == 0) {
                 String value = String.valueOf(newValue);
                 if (Preferences.writeWorldReadableProperty(getActivity(), key, value)) {
-                    ((CheckBoxPreference) preference).setChecked((Boolean) newValue);
+                    ((SwitchPreference) preference).setChecked((Boolean) newValue);
                     updateAccessModeStatus();
                     notify = true;
                 }
@@ -175,7 +175,7 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
 
         // Case sensitive sort
         this.mCaseSensitiveSort =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_CASE_SENSITIVE_SORT.getId());
         this.mCaseSensitiveSort.setOnPreferenceChangeListener(this.mOnChangeListener);
 
@@ -205,19 +205,19 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
 
         // Compute folder statistics
         this.mComputeFolderStatistics =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_COMPUTE_FOLDER_STATISTICS.getId());
         this.mComputeFolderStatistics.setOnPreferenceChangeListener(this.mOnChangeListener);
 
         // Display thumbs
         this.mDisplayThumbs =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_DISPLAY_THUMBS.getId());
         this.mDisplayThumbs.setOnPreferenceChangeListener(this.mOnChangeListener);
 
         // Use flinger
         this.mUseFlinger =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_USE_FLINGER.getId());
         this.mUseFlinger.setOnPreferenceChangeListener(this.mOnChangeListener);
 
@@ -236,7 +236,7 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
 
         // Capture Debug traces
         this.mRestrictSecondaryUsersAccess =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_RESTRICT_SECONDARY_USERS_ACCESS.getId());
         if (!AndroidHelper.hasSupportForMultipleUsers(getActivity()) ||
                 AndroidHelper.isSecondaryUser(getActivity())) {
@@ -253,7 +253,7 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
 
         // Capture Debug traces
         this.mDebugTraces =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_SHOW_TRACES.getId());
         this.mDebugTraces.setOnPreferenceChangeListener(this.mOnChangeListener);
 

diff --git a/src/com/cyanogenmod/filemanager/activities/preferences/SearchPreferenceFragment.java b/src/com/cyanogenmod/filemanager/activities/preferences/SearchPreferenceFragment.java
index d826f15..c5b958a 100644 (file)
--- a/src/com/cyanogenmod/filemanager/activities/preferences/SearchPreferenceFragment.java
+++ b/src/com/cyanogenmod/filemanager/activities/preferences/SearchPreferenceFragment.java
@@ -19,11 +19,11 @@ package com.cyanogenmod.filemanager.activities.preferences;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.SwitchPreference;
 import android.provider.SearchRecentSuggestions;
 import android.util.Log;
 import android.widget.Toast;
@@ -48,10 +48,10 @@ public class SearchPreferenceFragment extends TitlePreferenceFragment {
     private static final String REMOVE_SEARCH_TERMS_KEY =
                                         "cm_filemanager_remove_saved_search_terms"; //$NON-NLS-1$
 
-    private CheckBoxPreference mHighlightTerms;
-    private CheckBoxPreference mShowRelevanceWidget;
+    private SwitchPreference mHighlightTerms;
+    private SwitchPreference mShowRelevanceWidget;
     private ListPreference mSortSearchResultMode;
-    private CheckBoxPreference mSaveSearchTerms;
+    private SwitchPreference mSaveSearchTerms;
     private Preference mRemoveSearchTerms;
 
     /**
@@ -137,13 +137,13 @@ public class SearchPreferenceFragment extends TitlePreferenceFragment {
 
         // Highlight terms
         this.mHighlightTerms =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_HIGHLIGHT_TERMS.getId());
         this.mHighlightTerms.setOnPreferenceChangeListener(this.mOnChangeListener);
 
         // Relevance widget
         this.mShowRelevanceWidget =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_SHOW_RELEVANCE_WIDGET.getId());
         this.mShowRelevanceWidget.setOnPreferenceChangeListener(this.mOnChangeListener);
 
@@ -161,7 +161,7 @@ public class SearchPreferenceFragment extends TitlePreferenceFragment {
 
         // Saved search terms
         this.mSaveSearchTerms =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_SAVE_SEARCH_TERMS.getId());
         this.mSaveSearchTerms.setOnPreferenceChangeListener(this.mOnChangeListener);
 

diff --git a/src/com/cyanogenmod/filemanager/activities/preferences/StoragePreferenceFragment.java b/src/com/cyanogenmod/filemanager/activities/preferences/StoragePreferenceFragment.java
index d664dd4..8d2e60d 100644 (file)
--- a/src/com/cyanogenmod/filemanager/activities/preferences/StoragePreferenceFragment.java
+++ b/src/com/cyanogenmod/filemanager/activities/preferences/StoragePreferenceFragment.java
@@ -21,10 +21,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.SwitchPreference;
 import android.util.Log;
 
 import com.cyanogenmod.filemanager.R;
@@ -46,7 +46,7 @@ public class StoragePreferenceFragment extends TitlePreferenceFragment {
 
     private Preference mResetPassword;
     private Preference mDeleteStorage;
-    private CheckBoxPreference mDelayedSync;
+    private SwitchPreference mDelayedSync;
 
     private final BroadcastReceiver mMountStatusReceiver = new BroadcastReceiver() {
         @Override
@@ -138,7 +138,7 @@ public class StoragePreferenceFragment extends TitlePreferenceFragment {
 
         // Delayed sync
         this.mDelayedSync =
-                (CheckBoxPreference)findPreference(
+                (SwitchPreference)findPreference(
                         FileManagerSettings.SETTINGS_SECURE_STORAGE_DELAYED_SYNC.getId());
         this.mDelayedSync.setOnPreferenceChangeListener(this.mOnChangeListener);