[1/3] Omnigears: Moving code into OmniLib

https://github.com/arrase/android_packages_apps_OmniLib

Change-Id: I32aa3f240fb4e5a7be6279ec74bb10a7c987005e
diff --git a/res/xml/bars_settings.xml b/res/xml/bars_settings.xml
index 2a4fbed..020f01c 100644
--- a/res/xml/bars_settings.xml
+++ b/res/xml/bars_settings.xml
@@ -23,19 +23,19 @@
             android:key="category_statusbar"
             android:title="@string/statusbar_title">
 
-            <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
                 android:key="double_tap_sleep_gesture"
                 android:title="@string/double_tap_to_sleep_title"
                 android:summary="@string/double_tap_to_sleep_summary"
                 android:defaultValue="false" />
 
-            <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
                 android:key="status_bar_brightness_control"
                 android:title="@string/status_bar_toggle_brightness"
                 android:summary="@string/status_bar_toggle_brightness_summary"
                 android:defaultValue="false" />
 
-            <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
                 android:key="status_bar_ime_notification"
                 android:title="@string/status_bar_ime_notification_title"
                 android:summary="@string/status_bar_ime_notification_summary"
@@ -47,7 +47,7 @@
                 android:summary="@string/network_traffic_summary"
                 android:fragment="org.omnirom.omnigears.interfacesettings.NetworkTraffic" />
 
-            <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
                 android:key="status_bar_logo"
                 android:title="@string/status_bar_logo_title"
                 android:summary="@string/status_bar_logo_summary"
@@ -78,13 +78,13 @@
             android:key="category_navigationbar"
             android:title="@string/navigationbar_title">
 
-            <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
                 android:key="navigation_bar_ime_button"
                 android:title="@string/navigation_bar_ime_button_title"
                 android:summary="@string/navigation_bar_ime_button_summary"
                 android:defaultValue="true"/>
 
-            <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
                 android:key="navigation_bar_menu_arrow_keys"
                 android:title="@string/navigation_bar_menu_arrow_keys_title"
                 android:summary="@string/navigation_bar_menu_arrow_keys_summary"
@@ -108,20 +108,20 @@
             android:key="aspect_ratio_category"
             android:title="@string/aspect_ratio_category_title">
 
-            <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
                 android:key="aspect_ratio_apps_enabled"
                 android:title="@string/aspect_ratio_apps_enabled_title"
                 android:summary="@string/aspect_ratio_apps_enabled_summary"
                 android:defaultValue="false" />
 
-            <org.omnirom.omnigears.preference.AppMultiSelectListPreference
+            <org.omnirom.omnilib.preference.AppMultiSelectListPreference
                 android:dependency="aspect_ratio_apps_enabled"
                 android:key="aspect_ratio_apps_list"
                 android:persistent="false"
                 android:summary="@string/aspect_ratio_apps_list_summary"
                 android:title="@string/aspect_ratio_apps_list_title" />
 
-            <org.omnirom.omnigears.preference.ScrollAppsViewPreference
+            <org.omnirom.omnilib.preference.ScrollAppsViewPreference
                 android:dependency="aspect_ratio_apps_enabled"
                 android:key="aspect_ratio_apps_list_scroller"
                 android:persistent="false"
diff --git a/res/xml/battery_light_settings.xml b/res/xml/battery_light_settings.xml
index ad962fb..c44bada 100644
--- a/res/xml/battery_light_settings.xml
+++ b/res/xml/battery_light_settings.xml
@@ -19,7 +19,7 @@
         android:key="led_settings"
         android:title="@string/battery_light_settings_title" >
 
-    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
         android:key="battery_light_enabled"
         android:title="@string/battery_light_enable"
         android:persistent="false"/>
@@ -28,13 +28,13 @@
         android:key="general_section"
         android:title="@string/notification_light_general_title">
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="battery_light_pulse"
             android:title="@string/battery_low_pulse_title"
             android:dependency="battery_light_enabled"
             android:persistent="false" />
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="battery_light_only_fully_charged"
             android:title="@string/battery_light_only_full_charge_title"
             android:dependency="battery_light_enabled"
@@ -47,25 +47,25 @@
         android:title="@string/battery_light_list_title"
         android:dependency="battery_light_enabled" >
 
-        <org.omnirom.omnigears.preference.ColorSelectPreference
+        <org.omnirom.omnilib.preference.ColorSelectPreference
             android:key="low_color"
             ledPreview="true"
             android:title="@string/battery_light_low_color_title"
             android:persistent="false" />
 
-        <org.omnirom.omnigears.preference.ColorSelectPreference
+        <org.omnirom.omnilib.preference.ColorSelectPreference
             android:key="medium_color"
             ledPreview="true"
             android:title="@string/battery_light_medium_color_title"
             android:persistent="false" />
 
-        <org.omnirom.omnigears.preference.ColorSelectPreference
+        <org.omnirom.omnilib.preference.ColorSelectPreference
             android:key="full_color"
             ledPreview="true"
             android:title="@string/battery_light_full_color_title"
             android:persistent="false" />
 
-        <org.omnirom.omnigears.preference.ColorSelectPreference
+        <org.omnirom.omnilib.preference.ColorSelectPreference
             android:key="really_full_color"
             ledPreview="true"
             android:title="@string/battery_light_really_full_color_title"
@@ -78,13 +78,13 @@
         android:title="@string/fast_color_cat_title"
         android:dependency="battery_light_enabled" >
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="fast_charging_led_enabled"
             android:title="@string/fast_charging_led_enabled_title"
             android:summary="@string/fast_charging_led_enabled_summary"
             android:defaultValue="false" />
 
-        <org.omnirom.omnigears.preference.ColorSelectPreference
+        <org.omnirom.omnilib.preference.ColorSelectPreference
             android:key="fast_color"
             ledPreview="true"
             android:title="@string/fast_charging_light_color_title"
diff --git a/res/xml/button_brightness_settings.xml b/res/xml/button_brightness_settings.xml
index 928a649..1f88019 100644
--- a/res/xml/button_brightness_settings.xml
+++ b/res/xml/button_brightness_settings.xml
@@ -19,25 +19,25 @@
         android:key="button_brightness"
         android:title="@string/button_backlight_title" >
 
-    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
         android:key="button_backlight_enable"
         android:title="@string/button_backlight_enable_title"
         android:defaultValue="true"/>
-    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
         android:key="custom_button_use_screen_brightness"
         android:title="@string/button_link_brightness"
         android:summary="@string/button_link_brightness_summary"
         android:defaultValue="false"
         android:dependency="button_backlight_enable"
         android:disableDependentsState="true" />
-    <org.omnirom.omnigears.preference.SeekBarPreference
+    <org.omnirom.omnilib.preference.SeekBarPreference
         android:key="button_manual_brightness_new"
         android:title="@string/button_manual_brightness"
         android:max="255"
         settings:min="1"
         android:persistent="false"
         android:dependency="custom_button_use_screen_brightness" />
-    <org.omnirom.omnigears.preference.SeekBarPreference
+    <org.omnirom.omnilib.preference.SeekBarPreference
         android:key="button_timeout"
         android:title="@string/button_timeout_title"
         android:summary="@string/button_timeout_summary"
@@ -47,7 +47,7 @@
         settings:unitsRight="@string/unit_sec"
         android:persistent="false"
         android:dependency="button_backlight_enable" />
-    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
         android:key="button_backlight_on_touch_only"
         android:title="@string/button_backlight_on_touch_only_title"
         android:summary="@string/button_backlight_on_touch_only_summary"
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 2d2360a..8992d78 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -23,26 +23,26 @@
         android:key="button_volume_keys"
         android:title="@string/button_volume_keys_title" >
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="swap_volume_buttons"
             android:title="@string/swap_volume_buttons_title"
             android:summary="@string/swap_volume_buttons_summary"
             android:defaultValue="false" />
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="volume_button_force_media"
             android:title="@string/volume_button_force_media_title"
             android:summary="@string/volume_button_force_media_summary"
             android:defaultValue="false" />
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="volume_button_wake"
             android:title="@string/button_volume_wake_title"
             android:summary="@string/button_volume_wake_summary"
             android:disableDependentsState="true"
             android:defaultValue="false" />
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="volume_button_music_control"
             android:title="@string/volume_button_music_control_title"
             android:summary="@string/volume_button_music_control_summary"
@@ -83,13 +83,13 @@
             android:summary="@string/global_actions_summary"
             android:fragment="org.omnirom.omnigears.interfacesettings.GlobalActionsSettings" />
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="long_press_power_torch"
             android:title="@string/long_press_power_torch_title"
             android:summary="@string/long_press_power_torch_summary"
             android:defaultValue="false" />
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="system_proxi_check_enabled"
             android:title="@string/system_proxi_check_enabled_title"
             android:summary="@string/system_proxi_check_enabled_summary"
@@ -127,7 +127,7 @@
             android:entryValues="@array/long_press_home_action_values"
             android:persistent="false"/>
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="button_back_kill_enable"
             android:title="@string/button_back_kill_enable_title"
             android:summary="@string/button_back_kill_enable_summary"
diff --git a/res/xml/event_service_settings.xml b/res/xml/event_service_settings.xml
index 3a9a510..3dd950e 100644
--- a/res/xml/event_service_settings.xml
+++ b/res/xml/event_service_settings.xml
@@ -37,7 +37,7 @@
             android:persistent="false"
             android:summary="@string/category_media_player_info_title" />
 
-        <org.omnirom.omnigears.preference.AppMultiSelectListPreference
+        <org.omnirom.omnilib.preference.AppMultiSelectListPreference
             android:dependency="event_service_enabled"
             android:icon="@drawable/ic_settings_bluetooth"
             android:key="bt_a2dp_connect_app_string"
@@ -45,13 +45,13 @@
             android:summary="@string/bt_a2dp_connect_app_list_summary"
             android:title="@string/bt_a2dp_connect_app_list_title" />
 
-        <org.omnirom.omnigears.preference.ScrollAppsViewPreference
+        <org.omnirom.omnilib.preference.ScrollAppsViewPreference
             android:dependency="event_service_enabled"
             android:key="a2dp_app_list"
             android:persistent="false"
             android:selectable="false" />
 
-        <org.omnirom.omnigears.preference.AppMultiSelectListPreference
+        <org.omnirom.omnilib.preference.AppMultiSelectListPreference
             android:dependency="event_service_enabled"
             android:icon="@drawable/ic_headset_24dp"
             android:key="headset_connect_app_string"
@@ -59,7 +59,7 @@
             android:summary="@string/headset_connect_app_list_summary"
             android:title="@string/headset_connect_app_list_title" />
 
-        <org.omnirom.omnigears.preference.ScrollAppsViewPreference
+        <org.omnirom.omnilib.preference.ScrollAppsViewPreference
             android:dependency="event_service_enabled"
             android:key="headset_app_list"
             android:persistent="false"
@@ -86,7 +86,7 @@
             android:persistent="false"
             android:title="@string/media_player_autostart_title" />
 
-        <org.omnirom.omnigears.preference.SeekBarPreference
+        <org.omnirom.omnilib.preference.SeekBarPreference
             android:dependency="event_service_enabled"
             android:key="app_chooser_timeout"
             android:max="60"
@@ -104,7 +104,7 @@
             android:persistent="false"
             android:title="@string/app_chooser_position_title" />
 
-        <org.omnirom.omnigears.preference.SeekBarPreference
+        <org.omnirom.omnilib.preference.SeekBarPreference
             android:dependency="event_service_enabled"
             android:key="wired_events_threshold"
             android:max="6"
diff --git a/res/xml/global_actions.xml b/res/xml/global_actions.xml
index 58c89da..7e38cbe 100644
--- a/res/xml/global_actions.xml
+++ b/res/xml/global_actions.xml
@@ -20,13 +20,13 @@
         android:key="global_actions"
         android:title="@string/global_actions_title">
 
-    <org.omnirom.omnigears.preference.SecureSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SecureSettingSwitchPreference
         android:key="advanced_reboot"
         android:title="@string/global_actions_advanced_reboot_title"
         android:summary="@string/global_actions_advanced_reboot_summary_new"
         android:defaultValue="false" />
 
-    <org.omnirom.omnigears.preference.SecureSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SecureSettingSwitchPreference
         android:key="lockscreen_power_menu_disabled"
         android:title="@string/lockscreen_power_menu_disabled_title"
         android:summary="@string/lockscreen_power_menu_disabled_summary"
diff --git a/res/xml/lockscreen_settings.xml b/res/xml/lockscreen_settings.xml
index 3c6b3e7..48c1544 100644
--- a/res/xml/lockscreen_settings.xml
+++ b/res/xml/lockscreen_settings.xml
@@ -34,19 +34,19 @@
         android:summary="@string/lockscreen_item_summary"
         android:fragment="org.omnirom.omnigears.interfacesettings.LockscreenItemSettings" />
 
-    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
         android:key="lockscreen_hide_media"
         android:title="@string/lockscreen_hide_media_title"
         android:summary="@string/lockscreen_hide_media_summary"
         android:defaultValue="false" />
 
-    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
         android:key="double_tap_sleep_lockscreen"
         android:title="@string/double_tap_sleep_lockscreen_title"
         android:summary="@string/double_tap_sleep_lockscreen_summary"
         android:defaultValue="false" />
 
-    <org.omnirom.omnigears.preference.SecureSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SecureSettingSwitchPreference
         android:key="lockscreen_qs_disabled"
         android:title="@string/lockscreen_qs_disabled_title"
         android:summary="@string/lockscreen_qs_disabled_summary"
diff --git a/res/xml/lockscreenitems.xml b/res/xml/lockscreenitems.xml
index 395c698..daee8b6 100644
--- a/res/xml/lockscreenitems.xml
+++ b/res/xml/lockscreenitems.xml
@@ -20,43 +20,43 @@
     android:title="@string/lockscreen_item_title"
     android:key="lockscreen_item">
 
-    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
         android:key="hide_lockscreen_status_bar"
         android:title="@string/hide_lockscreen_status_bar_title"
         android:summary="@string/hide_lockscreen_status_bar_summary"
         android:defaultValue="false" />
 
-    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
         android:key="hide_lockscreen_clock"
         android:title="@string/hide_lockscreen_clock_title"
         android:summary="@string/hide_lockscreen_clock_summary"
         android:defaultValue="false" />
 
-    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
         android:key="hide_lockscreen_date"
         android:title="@string/hide_lockscreen_date_title"
         android:summary="@string/hide_lockscreen_date_summary"
         android:defaultValue="false" />
 
-    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
         android:key="hide_lockscreen_alarm"
         android:title="@string/hide_lockscreen_alarm_title"
         android:summary="@string/hide_lockscreen_alarm_summary"
         android:defaultValue="false" />
 
-    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
         android:key="hide_lockscreen_indicator_display"
         android:title="@string/hide_lockscreen_indicator_display_title"
         android:summary="@string/hide_lockscreen_indicator_display_summary"
         android:defaultValue="false" />
 
-    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
         android:key="hide_lockscreen_icon"
         android:title="@string/hide_lockscreen_icon_title"
         android:summary="@string/hide_lockscreen_icon_summary"
         android:defaultValue="false" />
 
-    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+    <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
         android:key="lockscreen_weather"
         android:title="@string/lockscreen_weather_title"
         android:summary="@string/lockscreen_weather_summary"
diff --git a/res/xml/more_settings.xml b/res/xml/more_settings.xml
index af90a69..e24fc64 100644
--- a/res/xml/more_settings.xml
+++ b/res/xml/more_settings.xml
@@ -23,7 +23,7 @@
             android:key="category_other"
             android:title="@string/other_category">
 
-            <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
                 android:key="volume_dialog_headers"
                 android:title="@string/volume_dialog_headers_title"
                 android:summary="@string/volume_dialog_headers_summary"
@@ -57,7 +57,7 @@
                 android:summary="@string/doze_settings_summary"
                 android:fragment="org.omnirom.omnigears.system.DozeSettings" />
 
-            <org.omnirom.omnigears.preference.GlobalSettingSwitchPreference
+            <org.omnirom.omnilib.preference.GlobalSettingSwitchPreference
                 android:key="show_cpu_overlay"
                 android:title="@string/show_cpu_title"
                 android:summary="@string/show_cpu_summary"
@@ -76,7 +76,7 @@
                 android:entryValues="@array/screen_off_animation_values"
                 android:persistent="false"/>
 
-            <org.omnirom.omnigears.preference.GlobalSettingSwitchPreference
+            <org.omnirom.omnilib.preference.GlobalSettingSwitchPreference
                 android:key="wake_when_plugged_or_unplugged"
                 android:title="@string/wake_when_plugged_or_unplugged_title"
                 android:summary="@string/wake_when_plugged_or_unplugged_summary"
diff --git a/res/xml/network_traffic.xml b/res/xml/network_traffic.xml
index 6b73836..ada186d 100644
--- a/res/xml/network_traffic.xml
+++ b/res/xml/network_traffic.xml
@@ -19,7 +19,7 @@
         android:key="category_network_traffic"
         android:title="@string/network_traffic_title">
 
-           <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+           <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
                 android:key="network_traffic_enable"
                 android:title="@string/network_traffic_enable_title"
                 android:defaultValue="false"/>
@@ -49,14 +49,14 @@
                 android:persistent="false"
                 android:dependency="network_traffic_enable" />
 
-            <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
                 android:key="network_traffic_autohide"
                 android:title="@string/network_traffic_autohide_title"
                 android:summary="@string/network_traffic_autohide_summary"
                 android:defaultValue="false"
                 android:dependency="network_traffic_enable" />
 
-            <org.omnirom.omnigears.preference.SeekBarPreference
+            <org.omnirom.omnilib.preference.SeekBarPreference
                 android:key="network_traffic_autohide_threshold"
                 android:title="@string/network_traffic_autohide_threshold"
                 android:max="100"
diff --git a/res/xml/statusbar_battery_settings.xml b/res/xml/statusbar_battery_settings.xml
index ac47c09..5ba2974 100644
--- a/res/xml/statusbar_battery_settings.xml
+++ b/res/xml/statusbar_battery_settings.xml
@@ -35,19 +35,19 @@
             android:persistent="false"
             android:defaultValue="0"/>
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="statusbar_battery_percent_inside"
             android:title="@string/statusbar_percent_inside_title"
             android:summary="@string/statusbar_percent_inside_summary"
             android:defaultValue="false"/>
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="statusbar_battery_dotted_line"
             android:title="@string/statusbar_battery_dotted_line_title"
             android:summary="@string/statusbar_battery_dotted_line_summary"
             android:defaultValue="false"/>
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="statusbar_battery_low_color_enable"
             android:title="@string/statusbar_battery_low_color_enable_title"
             android:summary="@string/statusbar_battery_low_color_enable_summary"
@@ -57,17 +57,17 @@
             android:key="statusbar_category_charging"
             android:title="@string/statusbar_category_charging_title">
 
-            <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
                 android:key="statusbar_battery_charging_image"
                 android:title="@string/statusbar_charging_image_title"
                 android:summary="@string/statusbar_charging_image_summary"
                 android:defaultValue="true"/>
-            <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
                 android:key="statusbar_battery_charging_color_enable"
                 android:title="@string/statusbar_battery_charging_color_enable_title"
                 android:summary="@string/statusbar_battery_charging_color_enable_summary"
                 android:defaultValue="false"/>
-            <org.omnirom.omnigears.preference.ColorSelectPreference
+            <org.omnirom.omnilib.preference.ColorSelectPreference
                 android:key="statusbar_battery_charging_color"
                 android:title="@string/statusbar_battery_charging_color_title"
                 android:persistent="false"
diff --git a/res/xml/statusbar_clock_settings.xml b/res/xml/statusbar_clock_settings.xml
index d2ae3c7..22847da 100644
--- a/res/xml/statusbar_clock_settings.xml
+++ b/res/xml/statusbar_clock_settings.xml
@@ -18,12 +18,12 @@
             android:title="@string/clock_title"
             android:key="statusbar_clock">
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="status_bar_clock"
             android:title="@string/status_bar_show_clock_title"
             android:defaultValue="true" />
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="status_bar_clock_seconds"
             android:title="@string/status_bar_clock_seconds_title"
             android:defaultValue="false"
diff --git a/res/xml/style_settings.xml b/res/xml/style_settings.xml
index b03adb2..3a25d72 100644
--- a/res/xml/style_settings.xml
+++ b/res/xml/style_settings.xml
@@ -60,7 +60,7 @@
         android:key="category_custom_header"
         android:title="@string/custom_header_title">
 
-        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
             android:key="status_bar_custom_header"
             android:title="@string/status_bar_custom_header_title"
             android:defaultValue="false" />
@@ -98,7 +98,7 @@
             android:dependency="status_bar_custom_header" >
         </Preference>
 
-        <org.omnirom.omnigears.preference.SeekBarPreference
+        <org.omnirom.omnilib.preference.SeekBarPreference
             android:key="status_bar_custom_header_shadow"
             android:title="@string/status_bar_custom_header_shadow_title"
             android:summary="@string/status_bar_custom_header_shadow_summary"