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

Commit b2bbed6b authored by x10f's avatar x10f Committed by Raj P
Browse files

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
parent d629b5aa

res/xml/preferences_editor.xml

+4 −4
Original line number Diff line number Diff line
@@ -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"

res/xml/preferences_editor_color_scheme.xml

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

res/xml/preferences_general.xml

+6 −6
Original line number Diff line number Diff line
@@ -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"

res/xml/preferences_search.xml

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

res/xml/preferences_storage.xml

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