diff options
author | x10f <android.x10f@gmail.com> | 2014-12-29 14:00:46 -0500 |
---|---|---|
committer | Raj P <android.x10f@gmail.com> | 2014-12-29 06:01:03 +0000 |
commit | b2bbed6b91b68a2007d3caf8c4a68b11aef36884 (patch) | |
tree | 508e3333966735aa28b62f94482f2309b14c5f85 /src | |
parent | d629b5aaf5201593c366e099dde5bd6bf1320995 (diff) | |
download | android_packages_apps_CMFileManager-b2bbed6b91b68a2007d3caf8c4a68b11aef36884.tar.gz android_packages_apps_CMFileManager-b2bbed6b91b68a2007d3caf8c4a68b11aef36884.tar.bz2 android_packages_apps_CMFileManager-b2bbed6b91b68a2007d3caf8c4a68b11aef36884.zip |
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
Diffstat (limited to 'src')
5 files changed, 36 insertions, 36 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/preferences/EditorPreferenceFragment.java b/src/com/cyanogenmod/filemanager/activities/preferences/EditorPreferenceFragment.java index 03836c56..5ff35524 100644 --- 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 4dbababd..e2b8f155 100644 --- 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 e578dc65..e66272a3 100644 --- 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 d826f154..c5b958a1 100644 --- 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 d664dd47..8d2e60d9 100644 --- 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); |