[1/2] OmniGears: bring back OmniGears
Change-Id: Ib4ceac4e11c493b9d7fb55599a9c55c1ee40546b
diff --git a/res/drawable/ic_homepage_omnigears.xml b/res/drawable/ic_homepage_omnigears.xml
new file mode 100644
index 0000000..c4101d7
--- /dev/null
+++ b/res/drawable/ic_homepage_omnigears.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2018 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item>
+ <shape android:shape="oval">
+ <solid
+ android:color="@color/omni_logo_color" />
+ <size
+ android:width="@dimen/dashboard_tile_image_size"
+ android:height="@dimen/dashboard_tile_image_size" />
+ </shape>
+ </item>
+
+ <item
+ android:width="@dimen/dashboard_tile_foreground_image_size"
+ android:height="@dimen/dashboard_tile_foreground_image_size"
+ android:start="@dimen/dashboard_tile_foreground_image_inset"
+ android:top="@dimen/dashboard_tile_foreground_image_inset"
+ android:drawable="@drawable/omnirom_logo_white" />
+</layer-list>
diff --git a/res/drawable/ic_settings_buttons.xml b/res/drawable/ic_settings_buttons.xml
new file mode 100644
index 0000000..ae3d68f
--- /dev/null
+++ b/res/drawable/ic_settings_buttons.xml
@@ -0,0 +1,25 @@
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M6,16H18V18H6V16M6,13V15H2V13H6M7,15V13H10V15H7M11,15V13H13V15H11M14,15V13H17V15H14M18,15V13H22V15H18M2,10H5V12H2V10M19,12V10H22V12H19M18,12H16V10H18V12M8,12H6V10H8V12M12,12H9V10H12V12M15,12H13V10H15V12M2,9V7H4V9H2M5,9V7H7V9H5M8,9V7H10V9H8M11,9V7H13V9H11M14,9V7H16V9H14M17,9V7H22V9H17Z" />
+</vector>
diff --git a/res/drawable/ic_settings_more.xml b/res/drawable/ic_settings_more.xml
new file mode 100644
index 0000000..4766b75
--- /dev/null
+++ b/res/drawable/ic_settings_more.xml
@@ -0,0 +1,25 @@
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/res/drawable/omnirom_logo.xml b/res/drawable/omnirom_logo.xml
new file mode 100644
index 0000000..e93e371
--- /dev/null
+++ b/res/drawable/omnirom_logo.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2017 The OmniROM Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="48dp"
+ android:height="48dp"
+ android:viewportWidth="512.000000"
+ android:viewportHeight="512.000000"
+ android:tint="@color/omni_logo_color">
+ <group
+ android:translateY="512.000000"
+ android:scaleX="0.100000"
+ android:scaleY="-0.100000">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:strokeWidth="1"
+ android:pathData="M1425 4703 c-526 -71 -929 -439 -1041 -953 -18 -80 -19 -149 -19 -1200 0 -1051 1
+-1120 19 -1200 104 -475 461 -832 936 -936 80 -18 150 -19 1230 -19 1080 0 1150 1
+1230 19 475 104 832 461 936 936 18 80 19 149 19 1200 0 1051 -1 1120 -19 1200
+-102 468 -444 816 -916 933 -84 21 -102 21 -1215 23 -621 1 -1143 0 -1160 -3z
+m2248 -578 c183 -39 350 -170 433 -342 66 -136 64 -102 62 -1243 l-3 -1030 -70 97
+c-134 186 -378 410 -571 524 -41 24 -74 47 -74 51 0 5 65 122 143 261 79 138 149
+262 155 273 10 20 7 24 -46 52 l-57 31 -159 -280 c-87 -153 -161 -279 -165 -279 -3
+0 -39 14 -80 30 -394 161 -889 172 -1301 29 -63 -22 -122 -43 -132 -46 -12 -4 -49
+54 -169 265 l-154 271 -57 -31 c-53 -28 -56 -32 -46 -52 6 -11 73 -131 150 -265 76
+-134 138 -246 138 -250 0 -3 -38 -28 -84 -54 -134 -78 -252 -172 -386 -306 -69 -70
+-156 -170 -195 -224 l-70 -97 -3 1030 c-2 1141 -4 1107 62 1243 82 170 249 303 428
+342 96 21 2153 21 2251 0z m-1880 -2429 c104 -43 127 -180 42 -255 -61 -53 -139
+-53 -201 1 -128 112 2 320 159 254z m1630 0 c104 -43 127 -180 42 -255 -61 -53
+-139 -53 -201 1 -128 112 2 320 159 254z" />
+ </group>
+</vector>
diff --git a/res/drawable/omnirom_logo_white.xml b/res/drawable/omnirom_logo_white.xml
new file mode 100644
index 0000000..051f7bd
--- /dev/null
+++ b/res/drawable/omnirom_logo_white.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2017 The OmniROM Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="48dp"
+ android:height="48dp"
+ android:viewportWidth="512.000000"
+ android:viewportHeight="512.000000"
+ android:tint="#ffffff">
+ <group
+ android:translateY="512.000000"
+ android:scaleX="0.100000"
+ android:scaleY="-0.100000">
+ <path
+ android:fillColor="@color/omni_logo_color"
+ android:strokeWidth="1"
+ android:pathData="M1425 4703 c-526 -71 -929 -439 -1041 -953 -18 -80 -19 -149 -19 -1200 0 -1051 1
+-1120 19 -1200 104 -475 461 -832 936 -936 80 -18 150 -19 1230 -19 1080 0 1150 1
+1230 19 475 104 832 461 936 936 18 80 19 149 19 1200 0 1051 -1 1120 -19 1200
+-102 468 -444 816 -916 933 -84 21 -102 21 -1215 23 -621 1 -1143 0 -1160 -3z
+m2248 -578 c183 -39 350 -170 433 -342 66 -136 64 -102 62 -1243 l-3 -1030 -70 97
+c-134 186 -378 410 -571 524 -41 24 -74 47 -74 51 0 5 65 122 143 261 79 138 149
+262 155 273 10 20 7 24 -46 52 l-57 31 -159 -280 c-87 -153 -161 -279 -165 -279 -3
+0 -39 14 -80 30 -394 161 -889 172 -1301 29 -63 -22 -122 -43 -132 -46 -12 -4 -49
+54 -169 265 l-154 271 -57 -31 c-53 -28 -56 -32 -46 -52 6 -11 73 -131 150 -265 76
+-134 138 -246 138 -250 0 -3 -38 -28 -84 -54 -134 -78 -252 -172 -386 -306 -69 -70
+-156 -170 -195 -224 l-70 -97 -3 1030 c-2 1141 -4 1107 62 1243 82 170 249 303 428
+342 96 21 2153 21 2251 0z m-1880 -2429 c104 -43 127 -180 42 -255 -61 -53 -139
+-53 -201 1 -128 112 2 320 159 254z m1630 0 c104 -43 127 -180 42 -255 -61 -53
+-139 -53 -201 1 -128 112 2 320 159 254z" />
+ </group>
+</vector>
diff --git a/res/values/custom_colors.xml b/res/values/custom_colors.xml
index 9302966..32c25d6 100644
--- a/res/values/custom_colors.xml
+++ b/res/values/custom_colors.xml
@@ -25,4 +25,5 @@
<color name="omni_clock_ambient_color">#ffffff</color>
<color name="omni_clock_ambient_bg_color">#000000</color>
<color name="omni_clock_text_color">#ffffff</color>
+ <color name="omni_logo_color">#a1c729</color>
</resources>
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index b553d0b..9ba64ff 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -799,4 +799,11 @@
<string name="gesture_settings_info">Available gestures:\n\nBack\n- Swipe up on left or right side\n\nHome\n- Swipe up center\n\nRecent apps\n- Swipe up center and hold\n\nLong press home\n- Short swipe up and hold in the center\n\n\nWorks best with navigation bar disabled.</string>
<string name="use_bottom_gesture_title">Navigation gestures</string>
<string name="use_bottom_gesture_summary">Use bottom swipe up gestures for navigation</string>
+
+ <string name="header_category_omni">OmniGears</string>
+ <string name="omni_dashboard_summary">Omnify your device</string>
+ <string name="button_settings_title">Buttons</string>
+ <string name="columns_menu">Columns layout</string>
+ <string name="hide_summary_menu">Hide summary</string>
+ <string name="more_settings_title">More</string>
</resources>
diff --git a/res/xml/bars_settings.xml b/res/xml/bars_settings.xml
deleted file mode 100644
index f19cfa6..0000000
--- a/res/xml/bars_settings.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (C) 2017 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="bars_settings"
- android:title="@string/custom_bars_settings_title" >
-
- <PreferenceCategory
- android:key="category_statusbar"
- android:title="@string/statusbar_title">
-
- <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.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.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"
- android:defaultValue="true"/>
-
- <Preference
- android:key="category_network_traffic"
- android:title="@string/network_traffic_title"
- android:summary="@string/network_traffic_summary"
- android:fragment="org.omnirom.omnigears.interfacesettings.NetworkTraffic" />
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="status_bar_logo"
- android:title="@string/status_bar_logo_title"
- android:summary="@string/status_bar_logo_summary"
- android:defaultValue="false" />
-
- <Preference
- android:key="statusbar_battery"
- android:title="@string/battery_title"
- android:summary="@string/statusbar_battery_summary"
- android:fragment="org.omnirom.omnigears.interfacesettings.StatusbarBatterySettings" />
-
- <Preference
- android:key="statusbar_clock"
- android:title="@string/clock_title"
- android:summary="@string/statusbar_clock_summary"
- android:fragment="org.omnirom.omnigears.interfacesettings.StatusbarClockSettings" />
-
- <ListPreference
- android:key="quick_pulldown"
- android:title="@string/quick_pulldown_title"
- android:entries="@array/quick_pulldown_entries"
- android:entryValues="@array/quick_pulldown_values"
- android:persistent="false" />
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="category_navigationbar"
- android:title="@string/navigationbar_title">
-
- <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.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"
- android:defaultValue="fale"/>
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="quick_settings_category"
- android:title="@string/quick_settings_category">
-
- <org.omnirom.omnilib.preference.SeekBarPreference
- android:key="qs_panel_alpha"
- android:title="@string/qs_panel_alpha_title"
- android:summary="@string/qs_panel_alpha_summary"
- android:max="100"
- settings:min="0"
- settings:unitsRight="@string/unit_percent"
- android:persistent="false" />
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="expanded_desktop_category"
- android:title="@string/expanded_desktop_title">
-
- <Preference
- android:key="expanded_desktop_category"
- android:title="@string/expanded_desktop_title"
- android:summary="@string/expanded_desktop_summary"
- android:fragment="org.omnirom.omnigears.interfacesettings.ExpandedDesktop" />
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="splitscreen_force_systembar_enabled"
- android:title="@string/splitscreen_force_systembar_enabled_title"
- android:summary="@string/splitscreen_force_systembar_enabled_summary"
- android:defaultValue="true" />
-
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="aspect_ratio_category"
- android:title="@string/aspect_ratio_category_title">
-
- <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.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.omnilib.preference.ScrollAppsViewPreference
- android:dependency="aspect_ratio_apps_enabled"
- android:key="aspect_ratio_apps_list_scroller"
- android:persistent="false"
- android:selectable="false" />
-
- <Preference
- android:dependency="aspect_ratio_apps_enabled"
- android:icon="@drawable/ic_info_outline_24dp"
- android:persistent="false"
- android:summary="@string/aspect_ratio_apps_info" />
- </PreferenceCategory>
-</PreferenceScreen>
diff --git a/res/xml/battery_light_settings.xml b/res/xml/battery_light_settings.xml
deleted file mode 100644
index c2e2698..0000000
--- a/res/xml/battery_light_settings.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The CyanogenMod Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="led_settings"
- android:title="@string/battery_light_settings_title" >
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="battery_light_enabled"
- android:title="@string/battery_light_enable"
- android:persistent="false"/>
-
- <PreferenceCategory
- android:key="general_section"
- android:title="@string/notification_light_general_title">
-
- <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.omnilib.preference.SystemSettingSwitchPreference
- android:key="battery_light_only_fully_charged"
- android:title="@string/battery_light_only_full_charge_title"
- android:dependency="battery_light_enabled"
- android:defaultValue="false" />
-
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="colors_list"
- android:title="@string/battery_light_list_title"
- android:dependency="battery_light_enabled" >
-
- <org.omnirom.omnilib.preference.ColorSelectPreference
- android:key="low_color"
- settings:ledPreview="true"
- android:title="@string/battery_light_low_color_title"
- android:persistent="false" />
-
- <org.omnirom.omnilib.preference.ColorSelectPreference
- android:key="medium_color"
- settings:ledPreview="true"
- android:title="@string/battery_light_medium_color_title"
- android:persistent="false" />
-
- <org.omnirom.omnilib.preference.ColorSelectPreference
- android:key="full_color"
- settings:ledPreview="true"
- android:title="@string/battery_light_full_color_title"
- android:persistent="false" />
-
- <org.omnirom.omnilib.preference.ColorSelectPreference
- android:key="really_full_color"
- settings:ledPreview="true"
- android:title="@string/battery_light_really_full_color_title"
- android:persistent="false" />
-
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="fast_color_cat"
- android:title="@string/fast_color_cat_title"
- android:dependency="battery_light_enabled" >
-
- <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.omnilib.preference.ColorSelectPreference
- android:key="fast_color"
- settings:ledPreview="true"
- android:title="@string/fast_charging_light_color_title"
- android:summary="@string/fast_charging_light_color_summary"
- android:persistent="false"
- android:dependency="fast_charging_led_enabled" />
-
- </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml/button_brightness_settings.xml b/res/xml/button_brightness_settings.xml
deleted file mode 100644
index 6f9a0c4..0000000
--- a/res/xml/button_brightness_settings.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="button_brightness"
- android:title="@string/button_backlight_title" >
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="button_backlight_enable"
- android:title="@string/button_backlight_enable_title"
- android:defaultValue="true"/>
- <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.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.omnilib.preference.SeekBarPreference
- android:key="button_timeout"
- android:title="@string/button_timeout_title"
- android:summary="@string/button_timeout_summary"
- android:max="30"
- settings:min="0"
- settings:unitsRight="@string/unit_sec"
- android:persistent="false"
- android:dependency="button_backlight_enable" />
- <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"
- android:defaultValue="false"
- android:dependency="button_backlight_enable" />
-</PreferenceScreen>
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 94684b1..7a3c13a 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -19,84 +19,6 @@
android:title="@string/button_settings_title" >
<PreferenceCategory
- android:key="button_volume_keys"
- android:title="@string/button_volume_keys_title" >
-
- <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.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.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.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"
- android:dependency="volume_button_wake"
- android:defaultValue="false" />
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="button_keys"
- android:title="@string/button_keys_title" >
-
- <SwitchPreference
- android:key="navigation_bar_show"
- android:title="@string/navigation_bar_show_title"
- android:summary="@string/navigation_bar_show_summary"
- android:persistent="false" />
- <SwitchPreference
- android:key="hardware_keys_disable"
- android:title="@string/hardware_keys_disable_title"
- android:summary="@string/hardware_keys_disable_summary"
- android:persistent="false" />
- <Preference
- android:key="button_brightness"
- android:title="@string/button_backlight_title"
- android:summary="@string/button_backlight_summary"
- android:persistent="false"
- android:fragment="org.omnirom.omnigears.ButtonBrightnessSettings" />
-
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="button_power"
- android:title="@string/global_actions_power_title" >
-
- <Preference
- android:key="global_actions"
- android:title="@string/global_actions_title"
- android:summary="@string/global_actions_summary"
- android:fragment="org.omnirom.omnigears.interfacesettings.GlobalActionsSettings" />
-
- <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.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"
- android:defaultValue="false"/>
-
- </PreferenceCategory>
-
- <PreferenceCategory
android:key="button_other"
android:title="@string/button_other_title" >
@@ -107,46 +29,6 @@
android:entryValues="@array/navbar_recents_style_values"
android:persistent="false"/>
- <ListPreference
- android:key="long_press_recents_action"
- android:title="@string/long_press_recents_action_title"
- android:entries="@array/long_press_recents_action_entries"
- android:entryValues="@array/long_press_recents_action_values"
- android:persistent="false"/>
- <ListPreference
- android:key="long_press_home_action"
- android:title="@string/long_press_home_action_title"
- android:entries="@array/long_press_home_action_entries"
- android:entryValues="@array/long_press_home_action_values"
- android:persistent="false"/>
- <ListPreference
- android:key="double_press_home_action"
- android:title="@string/double_press_home_action_title"
- android:entries="@array/long_press_home_action_entries"
- android:entryValues="@array/long_press_home_action_values"
- android:persistent="false"/>
-
- <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"
- android:defaultValue="false"/>
-
- <ListPreference
- android:key="button_back_kill_timeout"
- android:title="@string/button_back_kill_timeout_title"
- android:entries="@array/button_back_kill_timeout_entries"
- android:entryValues="@array/button_back_kill_timeout_values"
- android:defaultValue="1500"
- android:persistent="false"
- android:dependency="button_back_kill_enable"/>
-
- <SwitchPreference
- android:key="fingerprint_success_vib"
- android:title="@string/fprint_sucess_vib_title"
- android:summary="@string/fprint_sucess_vib_summary"
- android:persistent="false" />
-
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/digital_clock_settings.xml b/res/xml/digital_clock_settings.xml
deleted file mode 100644
index a27b789..0000000
--- a/res/xml/digital_clock_settings.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
- android:key="digital_clock_settings"
- android:title="@string/digital_clock_settings_title" >
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="lockscreen_digital_clock_two_lines"
- android:title="@string/lockscreen_digital_clock_two_lines_title"
- android:summary="@string/lockscreen_digital_clock_two_lines_summary"
- android:defaultValue="false" />
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="lockscreen_digital_clock_bold_hour"
- android:title="@string/lockscreen_digital_clock_bold_hour_title"
- android:summary="@string/lockscreen_digital_clock_bold_hour_summary"
- android:defaultValue="false" />
-</PreferenceScreen>
-
diff --git a/res/xml/display_rotation.xml b/res/xml/display_rotation.xml
deleted file mode 100644
index 5e03c90..0000000
--- a/res/xml/display_rotation.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:key="rotation_settings"
- android:title="@string/display_rotation_title" >
-
- <SwitchPreference
- android:key="accelerometer"
- android:title="@string/accelerometer_title"
- android:persistent="false" />
-
- <SwitchPreference
- android:key="lockscreen_rotation"
- android:title="@string/display_lockscreen_rotation_title"
- android:dependency="accelerometer"
- android:persistent="false" />
-
- <PreferenceCategory
- android:key="display_rotation_category"
- android:title="@string/display_rotation_category_title" />
-
- <SwitchPreference
- android:key="display_rotation_0"
- android:title="@string/display_rotation_0_title"
- android:dependency="accelerometer"
- android:persistent="false" />
-
- <SwitchPreference
- android:key="display_rotation_90"
- android:title="@string/display_rotation_90_title"
- android:dependency="accelerometer"
- android:persistent="false" />
-
- <SwitchPreference
- android:key="display_rotation_180"
- android:title="@string/display_rotation_180_title"
- android:dependency="accelerometer"
- android:persistent="false" />
-
- <SwitchPreference
- android:key="display_rotation_270"
- android:title="@string/display_rotation_270_title"
- android:dependency="accelerometer"
- android:persistent="false" />
-
-</PreferenceScreen>
diff --git a/res/xml/gesture_settings.xml b/res/xml/gesture_settings.xml
deleted file mode 100644
index 1cbce8a..0000000
--- a/res/xml/gesture_settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:key="gesture_settings"
- android:title="@string/gesture_settings_title" >
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="use_bottom_gesture_navigation"
- android:title="@string/use_bottom_gesture_title"
- android:summary="@string/use_bottom_gesture_summary"
- android:defaultValue="false" />
-
-</PreferenceScreen>
diff --git a/res/xml/global_actions.xml b/res/xml/global_actions.xml
deleted file mode 100644
index cc50072..0000000
--- a/res/xml/global_actions.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- -->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:key="global_actions"
- android:title="@string/global_actions_title">
-
- <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.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"
- android:defaultValue="false" />
-
-</PreferenceScreen>
diff --git a/res/xml/lockscreen_settings.xml b/res/xml/lockscreen_settings.xml
deleted file mode 100644
index 3ebe2ba..0000000
--- a/res/xml/lockscreen_settings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:key="lockscreen_settings"
- android:title="@string/lockscreen_category_title" >
-
- <Preference
- android:key="bottom_shortcuts_category"
- android:title="@string/systemui_tuner_lockscreen_bottom_shortcuts_title"
- android:summary="@string/systemui_tuner_lockscreen_bottom_shortcuts_summary">
- <intent android:action="android.intent.action.MAIN"
- android:targetPackage="com.android.systemui"
- android:targetClass="com.android.systemui.tuner.LockscreenTunerActivity" />
- </Preference>
-
- <Preference
- android:key="lockscreen_item"
- android:title="@string/lockscreen_item_title"
- android:summary="@string/lockscreen_item_summary"
- android:fragment="org.omnirom.omnigears.interfacesettings.LockscreenItemSettings" />
-
- <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.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.omnilib.preference.SecureSettingSwitchPreference
- android:key="lockscreen_qs_disabled"
- android:title="@string/lockscreen_qs_disabled_title"
- android:summary="@string/lockscreen_qs_disabled_summary"
- android:defaultValue="false" />
-
- <ListPreference
- android:key="lockscreen_clock_style"
- android:title="@string/lockscreen_clock_style_title"
- android:entries="@array/lockscreen_clock_style_entries"
- android:entryValues="@array/lockscreen_clock_style_values"
- android:persistent="false"/>
-
- <Preference
- android:key="digital_clock_settings"
- android:title="@string/digital_clock_settings_title"
- android:summary="@string/digital_clock_settings_summary"
- android:fragment="org.omnirom.omnigears.DigitalClockSettings" />
-
- <Preference
- android:key="omni_clock_settings"
- android:title="@string/omni_clock_settings_title"
- android:summary="@string/omni_clock_settings_summary"
- android:fragment="org.omnirom.omnigears.OmniClockSettings" />
-</PreferenceScreen>
-
diff --git a/res/xml/lockscreenitems.xml b/res/xml/lockscreenitems.xml
deleted file mode 100644
index 9f56016..0000000
--- a/res/xml/lockscreenitems.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/lockscreen_item_title"
- android:key="lockscreen_item">
-
- <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.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.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.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.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.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.omnilib.preference.SystemSettingSwitchPreference
- android:key="lockscreen_weather"
- android:title="@string/lockscreen_weather_title"
- android:summary="@string/lockscreen_weather_summary"
- android:defaultValue="false" />
-
- <Preference
- android:icon="@drawable/ic_info_outline_24dp"
- android:persistent="false"
- android:summary="@string/lockscreen_items_aod_info_title" />
-</PreferenceScreen>
-
diff --git a/res/xml/more_settings.xml b/res/xml/more_settings.xml
index 3569446..e808965 100644
--- a/res/xml/more_settings.xml
+++ b/res/xml/more_settings.xml
@@ -23,11 +23,6 @@
android:key="category_other"
android:title="@string/other_category">
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="volume_dialog_headers"
- android:title="@string/volume_dialog_headers_title"
- android:summary="@string/volume_dialog_headers_summary"
- android:defaultValue="true" />
<SwitchPreference
android:key="show_dashboard_columns"
android:title="@string/show_dashboard_columns_title"
@@ -41,53 +36,4 @@
</PreferenceCategory>
- <PreferenceCategory
- android:key="category_system"
- android:title="@string/system_category">
-
- <Preference
- android:key="time_in_state"
- android:title="@string/time_in_state_title"
- android:summary="@string/time_in_state_summary"
- android:fragment="org.omnirom.omnigears.system.TimeInState" />
-
- <Preference
- android:key="doze_settings"
- android:title="@string/doze_settings_title"
- android:summary="@string/doze_settings_summary"
- android:fragment="org.omnirom.omnigears.system.DozeSettings" />
-
- <org.omnirom.omnilib.preference.GlobalSettingSwitchPreference
- android:key="show_cpu_overlay"
- android:title="@string/show_cpu_title"
- android:summary="@string/show_cpu_summary"
- android:defaultValue="false" />
-
- <Preference
- android:key="volume_steps"
- android:title="@string/volume_steps_title"
- android:summary="@string/volume_steps_summary"
- android:fragment="org.omnirom.omnigears.system.VolumeSteps" />
-
- <ListPreference
- android:key="screen_off_animation"
- android:title="@string/screen_off_animation_title"
- android:entries="@array/screen_off_animation_entries"
- android:entryValues="@array/screen_off_animation_values"
- android:persistent="false"/>
-
- <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"
- android:defaultValue="@*android:bool/config_unplugTurnsOnScreen" />
-
- <org.omnirom.omnilib.preference.GlobalSettingSwitchPreference
- android:key="captive_portal_mode"
- android:title="@string/captive_portal_mode_title"
- android:summary="@string/captive_portal_mode_summary"
- android:defaultValue="true"
- android:persistent="true" />
-
- </PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/network_traffic.xml b/res/xml/network_traffic.xml
deleted file mode 100644
index c4d1dd8..0000000
--- a/res/xml/network_traffic.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="category_network_traffic"
- android:title="@string/network_traffic_title">
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="network_traffic_enable"
- android:title="@string/network_traffic_enable_title"
- android:defaultValue="false"/>
-
- <ListPreference
- android:key="network_traffic_state"
- android:title="@string/show_network_traffic_state"
- android:entries="@array/show_network_traffic_state_entries"
- android:entryValues="@array/show_network_traffic_state_values"
- android:persistent="false"
- android:defaultValue="1"
- android:dependency="network_traffic_enable" />
-
- <ListPreference
- android:key="network_traffic_unit"
- android:title="@string/show_network_traffic_unit"
- android:entries="@array/show_network_traffic_unit_entries"
- android:entryValues="@array/show_network_traffic_unit_values"
- android:persistent="false"
- android:dependency="network_traffic_enable" />
-
- <ListPreference
- android:key="network_traffic_period"
- android:title="@string/show_network_traffic_frequency"
- android:entries="@array/show_network_traffic_frequency_entries"
- android:entryValues="@array/show_network_traffic_frequency_values"
- android:persistent="false"
- android:dependency="network_traffic_enable" />
-
- <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.omnilib.preference.SeekBarPreference
- android:key="network_traffic_autohide_threshold"
- android:title="@string/network_traffic_autohide_threshold"
- android:max="100"
- settings:min="0"
- settings:unitsRight="@string/kbs"
- android:dependency="network_traffic_autohide"
- android:persistent="false" />
-
-</PreferenceScreen>
diff --git a/res/xml/omni_clock_settings.xml b/res/xml/omni_clock_settings.xml
deleted file mode 100644
index 344a198..0000000
--- a/res/xml/omni_clock_settings.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
- android:key="omni_clock_settings"
- android:title="@string/omni_clock_settings_title" >
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="lockscreen_omni_clock_24h_mode"
- android:title="@string/omni_clock_24h_mode_title"
- android:summary="@string/omni_clock_24h_mode_summary"
- android:defaultValue="false" />
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="lockscreen_omni_clock_show_ticks"
- android:title="@string/omni_clock_show_ticks_title"
- android:summary="@string/omni_clock_show_ticks_summary"
- android:defaultValue="false" />
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="lockscreen_omni_clock_show_numbers"
- android:title="@string/omni_clock_show_numbers_title"
- android:summary="@string/omni_clock_show_numbers_summary"
- android:defaultValue="false" />
-
- <org.omnirom.omnilib.preference.ColorSelectPreference
- android:key="bg_color"
- android:persistent="false"
- settings:multiColor="true"
- settings:withAlpha="true"
- android:title="@string/omni_clock_bg_color_title" />
-
- <org.omnirom.omnilib.preference.ColorSelectPreference
- android:key="border_color"
- android:persistent="false"
- settings:multiColor="true"
- settings:withAlpha="true"
- android:title="@string/omni_clock_border_color_title" />
-
- <org.omnirom.omnilib.preference.ColorSelectPreference
- android:key="hour_color"
- android:persistent="false"
- settings:multiColor="true"
- settings:withAlpha="true"
- android:title="@string/omni_clock_hour_color_title" />
-
- <org.omnirom.omnilib.preference.ColorSelectPreference
- android:key="minute_color"
- android:persistent="false"
- settings:multiColor="true"
- settings:withAlpha="true"
- android:title="@string/omni_clock_minute_color_title" />
-
- <org.omnirom.omnilib.preference.ColorSelectPreference
- android:key="text_color"
- android:persistent="false"
- settings:multiColor="true"
- settings:withAlpha="true"
- android:title="@string/omni_clock_text_color_title" />
-
- <org.omnirom.omnilib.preference.ColorSelectPreference
- android:key="accent_color"
- android:persistent="false"
- settings:multiColor="true"
- settings:withAlpha="true"
- android:title="@string/omni_clock_accent_color_title" />
-</PreferenceScreen>
-
diff --git a/res/xml/omni_dashboard_fragment.xml b/res/xml/omni_dashboard_fragment.xml
index c63c1ed..3f6ed8d 100644
--- a/res/xml/omni_dashboard_fragment.xml
+++ b/res/xml/omni_dashboard_fragment.xml
@@ -19,75 +19,16 @@
android:title="@string/header_category_omni">
<Preference
- android:key="style_settings_new"
- android:title="@string/style_settings_title"
- android:summary="@string/style_settings_summary"
- android:icon="@drawable/ic_settings_style"
- android:fragment="org.omnirom.omnigears.interfacesettings.StyleSettings" />
-
- <Preference
- android:key="device_parts"
- android:title="@string/omni_device_parts"
- android:icon="@drawable/ic_settings_omnigears"
- android:fragment="org.omnirom.device.DeviceParts" />
-
- <Preference
android:key="button_settings"
android:title="@string/button_settings_title"
android:icon="@drawable/ic_settings_buttons"
android:fragment="org.omnirom.omnigears.ButtonSettings" />
<Preference
- android:key="bars_settings"
- android:title="@string/custom_bars_settings_title"
- android:icon="@drawable/ic_bars_tile"
- android:fragment="org.omnirom.omnigears.interfacesettings.BarsSettings" />
-
- <Preference
- android:key="lockscreen_settings"
- android:title="@string/lockscreen_category_title"
- android:icon="@drawable/ic_lockscreen_tile"
- android:fragment="org.omnirom.omnigears.interfacesettings.LockscreenSettings" />
-
- <Preference
- android:key="rotation_settings"
- android:title="@string/display_rotation_title"
- android:summary="@string/display_rotation_summary"
- android:icon="@drawable/ic_display_rotation_tile"
- android:fragment="org.omnirom.omnigears.DisplayRotation" />
-
- <Preference
- android:key="led_settings"
- android:title="@string/battery_light_settings_title"
- android:icon="@drawable/ic_settings_leds"
- android:fragment="org.omnirom.omnigears.batterylight.BatteryLightSettings" />
-
- <Preference
- android:key="event_service_settings"
- android:title="@string/event_service_settings_title"
- android:icon="@drawable/ic_settings_event_service">
- <intent
- android:action="android.intent.action.MAIN"
- android:targetPackage="org.omnirom.omnibrain"
- android:targetClass="org.omnirom.omnibrain.OmniBrainActivity" />
- </Preference>
-
- <Preference
- android:key="omnijaws_settings"
- android:icon="@drawable/ic_qs_weather_default_on"
- android:title="@string/weather_title"
- android:fragment="org.omnirom.omnigears.moresettings.OmniJawsSettings" />
-
- <Preference
- android:key="gesture_settings"
- android:icon="@drawable/ic_settings_gestures"
- android:title="@string/gesture_settings_title"
- android:fragment="org.omnirom.omnigears.GestureSettings" />
-
- <Preference
android:key="more_settings"
android:title="@string/more_settings_title"
android:icon="@drawable/ic_settings_more"
android:fragment="org.omnirom.omnigears.moresettings.MoreSettings"
android:order="11" />
+
</PreferenceScreen>
diff --git a/res/xml/omnijaws_settings.xml b/res/xml/omnijaws_settings.xml
deleted file mode 100644
index 2c24a0f..0000000
--- a/res/xml/omnijaws_settings.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- -->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:key="omnijaws_settings"
- android:title="@string/weather_title">
-
- <PreferenceScreen
- android:title="@string/weather_config_title"
- android:summary="@string/weather_config_summary" >
- <intent android:action="android.intent.action.MAIN"
- android:targetPackage="org.omnirom.omnijaws"
- android:targetClass="org.omnirom.omnijaws.SettingsActivityService" />
- </PreferenceScreen>
-
- <ListPreference
- android:key="weather_icon_pack"
- android:title="@string/weather_icon_pack_title"
- android:persistent="false" />
-
- <Preference
- android:icon="@drawable/ic_info_outline_24dp"
- android:persistent="false"
- android:summary="@string/weather_icon_pack_info_title" />
-</PreferenceScreen>
diff --git a/res/xml/preference_app_select.xml b/res/xml/preference_app_select.xml
deleted file mode 100644
index 39ebee3..0000000
--- a/res/xml/preference_app_select.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2016 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:gravity="center_vertical"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:background="?android:attr/selectableItemBackground"
- android:clipToPadding="false"
- android:orientation="horizontal" >
-
- <LinearLayout
- android:id="@+id/icon_frame"
- style="@style/preference_icon_frame"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="start|center_vertical"
- android:orientation="horizontal"
- android:clipToPadding="false"
- android:paddingEnd="12dp"
- android:paddingTop="4dp"
- android:paddingBottom="4dp">
- <com.android.internal.widget.PreferenceImageView
- android:id="@android:id/icon"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:gravity="center"
- android:scaleType="centerInside" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:gravity="center_vertical"
- android:layout_weight="1" >
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginEnd="6dip"
- android:layout_marginTop="10dip"
- android:layout_marginBottom="6dip" >
-
- <TextView android:id="@android:id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceListItem"
- android:ellipsize="marquee" />
-
- <TextView android:id="@android:id/summary"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@android:id/title"
- android:layout_alignStart="@android:id/title"
- android:textAppearance="?android:attr/textAppearanceListItemSecondary"
- android:textColor="?android:attr/textColorSecondary"
- android:maxLines="10"
- android:ellipsize="end" />
-
- </RelativeLayout>
- </LinearLayout>
-</LinearLayout>
diff --git a/res/xml/statusbar_battery_settings.xml b/res/xml/statusbar_battery_settings.xml
deleted file mode 100644
index 6027872..0000000
--- a/res/xml/statusbar_battery_settings.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015-2018 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
- android:title="@string/battery_title"
- android:key="statusbar_battery">
-
- <ListPreference
- android:key="statusbar_battery_style"
- android:title="@string/battery_style_title"
- android:entries="@array/battery_styles_entries"
- android:entryValues="@array/battery_styles_values"
- android:persistent="false"
- android:defaultValue="0"/>
-
- <ListPreference
- android:key="statusbar_battery_percent_enable"
- android:title="@string/battery_percent_title"
- android:entries="@array/battery_percent_enable_entries"
- android:entryValues="@array/battery_percent_enable_values"
- android:persistent="false"
- android:defaultValue="0"/>
-
- <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.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.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"
- android:defaultValue="true"/>
-
- <PreferenceCategory
- android:key="statusbar_category_charging"
- android:title="@string/statusbar_category_charging_title">
-
- <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.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.omnilib.preference.ColorSelectPreference
- android:key="statusbar_battery_charging_color"
- settings:multiColor="true"
- settings:withAlpha="true"
- android:title="@string/statusbar_battery_charging_color_title"
- android:persistent="false"
- android:dependency ="statusbar_battery_charging_color_enable"/>
-
- </PreferenceCategory>
-</PreferenceScreen>
diff --git a/res/xml/statusbar_clock_settings.xml b/res/xml/statusbar_clock_settings.xml
deleted file mode 100644
index eb9806e..0000000
--- a/res/xml/statusbar_clock_settings.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015-2018 The OmniROM Project
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/clock_title"
- android:key="statusbar_clock">
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="status_bar_clock"
- android:title="@string/status_bar_show_clock_title"
- android:defaultValue="true" />
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="status_bar_clock_seconds"
- android:title="@string/status_bar_clock_seconds_title"
- android:defaultValue="false"
- android:dependency="status_bar_clock" />
-
- <ListPreference
- android:key="clock_style"
- android:entries="@array/clock_style_entries"
- android:entryValues="@array/clock_style_values"
- android:title="@string/clock_title_enable"
- android:dependency="status_bar_clock"
- android:persistent="false" />
-
- <ListPreference
- android:key="status_bar_am_pm"
- android:dialogTitle="@string/status_bar_am_pm_title"
- android:title="@string/status_bar_am_pm_title"
- android:entries="@array/entries_status_bar_am_pm"
- android:entryValues="@array/values_status_bar_am_pm"
- android:dependency="status_bar_clock"
- android:persistent="false" />
-
- <ListPreference
- android:key="clock_date_display"
- android:title="@string/clock_date_display"
- android:summary="@string/clock_date_display_summary"
- android:entries="@array/clock_date_display_entries"
- android:entryValues="@array/clock_date_display_values"
- android:dependency="status_bar_clock"
- android:persistent="false" />
-
- <ListPreference
- android:key="clock_date_style"
- android:title="@string/clock_date_style"
- android:entries="@array/clock_date_style_entries"
- android:entryValues="@array/clock_date_style_values"
- android:dependency="status_bar_clock"
- android:persistent="false" />
-
- <ListPreference
- android:key="clock_date_position"
- android:title="@string/clock_date_position"
- android:entries="@array/clock_date_position_entries"
- android:entryValues="@array/clock_date_position_values"
- android:dependency="status_bar_clock"
- android:persistent="false" />
-
- <ListPreference
- android:key="clock_date_format"
- android:title="@string/clock_date_format"
- android:entries="@array/clock_date_format_entries_values"
- android:entryValues="@array/clock_date_format_entries_values"
- android:dependency="status_bar_clock"
- android:persistent="false" />
-
-</PreferenceScreen>
-
diff --git a/res/xml/style_settings.xml b/res/xml/style_settings.xml
deleted file mode 100644
index 00f0f33..0000000
--- a/res/xml/style_settings.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The OmniROM Project
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="style_settings"
- android:title="@string/style_settings_title" >
-
- <PreferenceCategory
- android:key="category_theming"
- android:title="@string/theming_title">
-
- <Preference
- android:key="custom_wall_browse"
- android:title="@string/custom_wall_browse_title"
- android:summary="@string/custom_wall_browse_summary"
- android:persistent="false" >
- <intent android:action="android.intent.action.MAIN"
- android:targetPackage="org.omnirom.omnistyle"
- android:targetClass="org.omnirom.omnistyle.BrowseWallsActivity" />
- </Preference>
-
- <ListPreference
- android:key="systemui_theme_style"
- android:title="@string/systemui_theme_style_title"
- android:persistent="false"
- android:entries="@array/systemui_theme_style_entries"
- android:entryValues="@array/systemui_theme_style_values" />
-
- <!--<ListPreference
- android:key="omni_theme_select"
- android:title="@string/omni_theme_select_title"
- android:summary="@string/summary_placeholder" />-->
-
- <Preference
- android:key="omni_theme_select_activity"
- android:title="@string/omni_theme_select_title"
- android:summary="@string/omni_theme_select_summary"
- android:persistent="false" >
- <intent android:action="android.intent.action.MAIN"
- android:targetPackage="org.omnirom.omnistyle"
- android:targetClass="org.omnirom.omnistyle.BrowseThemesActivity" />
- </Preference>
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="category_custom_header"
- android:title="@string/custom_header_title">
-
- <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
- android:key="status_bar_custom_header"
- android:title="@string/status_bar_custom_header_title"
- android:defaultValue="false" />
-
- <ListPreference
- android:key="custom_header_provider"
- android:title="@string/custom_header_provider_title"
- android:persistent="false"
- android:entries="@array/custom_header_provider_entries"
- android:entryValues="@array/custom_header_provider_values"
- android:dependency="status_bar_custom_header" />
-
- <ListPreference
- android:key="daylight_header_pack"
- android:title="@string/daylight_header_pack_title"
- android:persistent="false"
- android:dependency="status_bar_custom_header" />
-
- <Preference
- android:key="custom_header_browse"
- android:title="@string/custom_header_pick_title"
- android:summary="@string/custom_header_pick_summary"
- android:persistent="false"
- android:dependency="status_bar_custom_header" >
- <intent android:action="android.intent.action.MAIN"
- android:targetPackage="org.omnirom.omnistyle"
- android:targetClass="org.omnirom.omnistyle.PickHeaderActivity" />
- </Preference>
-
- <Preference
- android:key="file_header_select"
- android:title="@string/file_header_select_title"
- android:summary="@string/file_header_select_summary"
- android:persistent="false"
- android:dependency="status_bar_custom_header" >
- </Preference>
-
- <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"
- android:max="100"
- settings:min="0"
- settings:unitsRight="@string/unit_percent"
- android:persistent="false"
- android:dependency="status_bar_custom_header" />
-
- </PreferenceCategory>
-</PreferenceScreen>
diff --git a/res/xml/volume_steps.xml b/res/xml/volume_steps.xml
deleted file mode 100644
index abc1851..0000000
--- a/res/xml/volume_steps.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/volume_steps_title"
- android:key="volume_steps">
-
- <ListPreference
- android:key="volume_steps_music"
- android:title="@string/media_volume_option_title"
- android:entries="@array/volume_steps_entries"
- android:entryValues="@array/volume_steps_values" />
-
- <ListPreference
- android:key="volume_steps_alarm"
- android:title="@string/alarm_volume_option_title"
- android:entries="@array/volume_steps_entries"
- android:entryValues="@array/volume_steps_values" />
-
- <ListPreference
- android:key="volume_steps_ring"
- android:title="@string/ring_volume_option_title"
- android:entries="@array/volume_steps_entries"
- android:entryValues="@array/volume_steps_values" />
-
- <ListPreference
- android:key="volume_steps_notification"
- android:title="@string/notification_volume_option_title"
- android:entries="@array/volume_steps_entries"
- android:entryValues="@array/volume_steps_values" />
-
- <ListPreference
- android:key="volume_steps_system"
- android:title="@string/system_volume_option_title"
- android:entries="@array/volume_steps_entries"
- android:entryValues="@array/volume_steps_values" />
-
- <ListPreference
- android:key="volume_steps_voice_call"
- android:title="@string/call_volume_option_title"
- android:entries="@array/volume_steps_entries"
- android:entryValues="@array/volume_steps_values" />
-</PreferenceScreen>
diff --git a/src/org/omnirom/omnigears/ButtonBrightnessSettings.java b/src/org/omnirom/omnigears/ButtonBrightnessSettings.java
deleted file mode 100644
index 3072c13..0000000
--- a/src/org/omnirom/omnigears/ButtonBrightnessSettings.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2014 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.omnirom.omnigears;
-
-import com.android.settings.SettingsPreferenceFragment;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.PowerManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings;
-import android.provider.SearchIndexableResource;
-
-import org.omnirom.omnilib.preference.SeekBarPreference;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import java.util.List;
-import java.util.Arrays;
-
-public class ButtonBrightnessSettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, Indexable {
- private static final String TAG = "ButtonBrightnessSettings";
-
- private static final String KEY_BUTTON_MANUAL_BRIGHTNESS_NEW = "button_manual_brightness_new";
- private static final String KEY_BUTTON_TIMEOUT = "button_timeout";
-
- private SeekBarPreference mButtonTimoutBar;
- private SeekBarPreference mManualButtonBrightness;
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.button_brightness_settings);
-
- PreferenceScreen prefSet = getPreferenceScreen();
- ContentResolver resolver = getContentResolver();
-
- mManualButtonBrightness = (SeekBarPreference) findPreference(KEY_BUTTON_MANUAL_BRIGHTNESS_NEW);
- final int customButtonBrightness = getResources().getInteger(
- com.android.internal.R.integer.config_button_brightness_default);
- final int currentBrightness = Settings.System.getInt(resolver,
- Settings.System.CUSTOM_BUTTON_BRIGHTNESS, customButtonBrightness);
- PowerManager pm = (PowerManager)getActivity().getSystemService(Context.POWER_SERVICE);
- mManualButtonBrightness.setMaxValue(pm.getMaximumScreenBrightnessSetting());
- mManualButtonBrightness.setValue(currentBrightness);
- mManualButtonBrightness.setOnPreferenceChangeListener(this);
-
- mButtonTimoutBar = (SeekBarPreference) findPreference(KEY_BUTTON_TIMEOUT);
- int currentTimeout = Settings.System.getInt(resolver,
- Settings.System.BUTTON_BACKLIGHT_TIMEOUT, 0);
- mButtonTimoutBar.setValue(currentTimeout);
- mButtonTimoutBar.setOnPreferenceChangeListener(this);
- }
-
- @Override
- public boolean onPreferenceTreeClick(Preference preference) {
- return super.onPreferenceTreeClick(preference);
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object objValue) {
- final String key = preference.getKey();
-
- if (preference == mButtonTimoutBar) {
- int buttonTimeout = (Integer) objValue;
- Settings.System.putInt(getContentResolver(),
- Settings.System.BUTTON_BACKLIGHT_TIMEOUT, buttonTimeout);
- } else if (preference == mManualButtonBrightness) {
- int buttonBrightness = (Integer) objValue;
- Settings.System.putInt(getContentResolver(),
- Settings.System.CUSTOM_BUTTON_BRIGHTNESS, buttonBrightness);
- } else {
- return false;
- }
- return true;
- }
-
- /**
- * For Search.
- */
- public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
-
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(
- Context context, boolean enabled) {
- final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.button_brightness_settings;
- return Arrays.asList(sir);
- }
- };
-}
-
diff --git a/src/org/omnirom/omnigears/ButtonSettings.java b/src/org/omnirom/omnigears/ButtonSettings.java
index a6d3a92..f71bcff 100644
--- a/src/org/omnirom/omnigears/ButtonSettings.java
+++ b/src/org/omnirom/omnigears/ButtonSettings.java
@@ -52,30 +52,9 @@
public class ButtonSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener, Indexable {
- private static final String CATEGORY_KEYS = "button_keys";
- private static final String CATEGORY_OTHER = "button_other";
- private static final String CATEGORY_POWER = "button_power";
- private static final String KEYS_SHOW_NAVBAR_KEY = "navigation_bar_show";
- private static final String KEYS_DISABLE_HW_KEY = "hardware_keys_disable";
private static final String NAVIGATION_BAR_RECENTS_STYLE = "navbar_recents_style";
- private static final String LONG_PRESS_RECENTS_ACTION = "long_press_recents_action";
- private static final String LONG_PRESS_HOME_ACTION = "long_press_home_action";
- private static final String DOUBLE_PRESS_HOME_ACTION = "double_press_home_action";
- private static final String BUTTON_BACK_KILL_TIMEOUT = "button_back_kill_timeout";
- private static final String KEY_BUTTON_LIGHT = "button_brightness";
- private static final String FINGERPRINT_VIB = "fingerprint_success_vib";
- private static final String SYSTEM_PROXI_CHECK_ENABLED = "system_proxi_check_enabled";
private ListPreference mNavbarRecentsStyle;
- private ListPreference mLongPressRecentsAction;
- private ListPreference mLongPressHomeAction;
- private ListPreference mDoublePressHomeAction;
- private SwitchPreference mEnableNavBar;
- private SwitchPreference mDisabkeHWKeys;
- private ListPreference mBackKillTimeout;
- private Preference mButtonLight;
- private FingerprintManager mFingerprintManager;
- private SwitchPreference mFingerprintVib;
@Override
public int getMetricsCategory() {
@@ -90,112 +69,18 @@
final ContentResolver resolver = getContentResolver();
final PreferenceScreen prefScreen = getPreferenceScreen();
- final int deviceKeys = getResources().getInteger(
- com.android.internal.R.integer.config_deviceHardwareKeys);
- final boolean buttonLights = getResources().getBoolean(
- com.android.internal.R.bool.config_button_brightness_support);
- final PreferenceCategory keysCategory =
- (PreferenceCategory) prefScreen.findPreference(CATEGORY_KEYS);
- final PreferenceCategory otherCategory =
- (PreferenceCategory) prefScreen.findPreference(CATEGORY_OTHER);
- final PreferenceCategory powerCategory =
- (PreferenceCategory) prefScreen.findPreference(CATEGORY_POWER);
-
- mEnableNavBar = (SwitchPreference) prefScreen.findPreference(KEYS_SHOW_NAVBAR_KEY);
- mDisabkeHWKeys = (SwitchPreference) prefScreen.findPreference(KEYS_DISABLE_HW_KEY);
- mButtonLight = prefScreen.findPreference(KEY_BUTTON_LIGHT);
-
- // No keys or no dedicated HW home/nav keys
- if (deviceKeys == 0 || deviceKeys % 8 == 0) {
- keysCategory.removePreference(mDisabkeHWKeys);
- } else {
- boolean hardwareKeysDisable = Settings.System.getInt(resolver,
- Settings.System.HARDWARE_KEYS_DISABLE, 0) == 1;
- mDisabkeHWKeys.setChecked(hardwareKeysDisable);
- }
- if (!buttonLights || deviceKeys == 0) {
- keysCategory.removePreference(mButtonLight);
- }
-
- boolean showNavBarDefault = DeviceUtils.deviceSupportNavigationBar(getActivity());
- boolean showNavBar = Settings.System.getInt(resolver,
- Settings.System.NAVIGATION_BAR_SHOW, showNavBarDefault ? 1 : 0) == 1;
- mEnableNavBar.setChecked(showNavBar);
mNavbarRecentsStyle = (ListPreference) findPreference(NAVIGATION_BAR_RECENTS_STYLE);
int recentsStyle = Settings.System.getInt(resolver,
- Settings.System.NAVIGATION_BAR_RECENTS, 0);
+ Settings.System.OMNI_NAVIGATION_BAR_RECENTS, 0);
mNavbarRecentsStyle.setValue(Integer.toString(recentsStyle));
mNavbarRecentsStyle.setSummary(mNavbarRecentsStyle.getEntry());
mNavbarRecentsStyle.setOnPreferenceChangeListener(this);
-
- mLongPressRecentsAction = (ListPreference) findPreference(LONG_PRESS_RECENTS_ACTION);
- int longPressRecentsAction = Settings.System.getInt(resolver,
- Settings.System.BUTTON_LONG_PRESS_RECENTS, 0);
-
- mLongPressRecentsAction.setValue(Integer.toString(longPressRecentsAction));
- mLongPressRecentsAction.setSummary(mLongPressRecentsAction.getEntry());
- mLongPressRecentsAction.setOnPreferenceChangeListener(this);
-
- // for navbar devices default is always assist LONG_PRESS_HOME_ASSIST = 2
- int defaultLongPressOnHomeBehavior = (deviceKeys == 0) ? 2 : getResources().getInteger(com.android.internal.R.integer.config_longPressOnHomeBehavior);
- mLongPressHomeAction = (ListPreference) findPreference(LONG_PRESS_HOME_ACTION);
- int longPressHomeAction = Settings.System.getInt(resolver,
- Settings.System.BUTTON_LONG_PRESS_HOME, defaultLongPressOnHomeBehavior);
-
- mBackKillTimeout = (ListPreference) findPreference(BUTTON_BACK_KILL_TIMEOUT);
- final int backKillTimeoutDefault = getResources().getInteger(com.android.internal.R.integer.config_backKillTimeout);
- final int backKillTimeout = Settings.System.getInt(resolver,
- Settings.System.BUTTON_BACK_KILL_TIMEOUT, backKillTimeoutDefault);
-
- mBackKillTimeout.setValue(Integer.toString(backKillTimeout));
- mBackKillTimeout.setSummary(mBackKillTimeout.getEntry());
- mBackKillTimeout.setOnPreferenceChangeListener(this);
-
- mLongPressHomeAction.setValue(Integer.toString(longPressHomeAction));
- mLongPressHomeAction.setSummary(mLongPressHomeAction.getEntry());
- mLongPressHomeAction.setOnPreferenceChangeListener(this);
-
- int defaultDoublePressOnHomeBehavior = getResources().getInteger(com.android.internal.R.integer.config_doubleTapOnHomeBehavior);
- mDoublePressHomeAction = (ListPreference) findPreference(DOUBLE_PRESS_HOME_ACTION);
- int doublePressHomeAction = Settings.System.getInt(resolver,
- Settings.System.BUTTON_DOUBLE_PRESS_HOME, defaultDoublePressOnHomeBehavior);
-
- mDoublePressHomeAction.setValue(Integer.toString(doublePressHomeAction));
- mDoublePressHomeAction.setSummary(mDoublePressHomeAction.getEntry());
- mDoublePressHomeAction.setOnPreferenceChangeListener(this);
-
- mFingerprintManager = (FingerprintManager) getActivity().getSystemService(Context.FINGERPRINT_SERVICE);
- mFingerprintVib = (SwitchPreference) findPreference(FINGERPRINT_VIB);
- if (mFingerprintManager == null || !mFingerprintManager.isHardwareDetected()){
- otherCategory.removePreference(mFingerprintVib);
- } else {
- mFingerprintVib.setChecked((Settings.System.getInt(getContentResolver(),
- Settings.System.FINGERPRINT_SUCCESS_VIB, 1) == 1));
- mFingerprintVib.setOnPreferenceChangeListener(this);
- }
-
- boolean supportPowerButtonProxyCheck = getResources().getBoolean(com.android.internal.R.bool.config_proxiSensorWakupCheck);
- SwitchPreference proxyCheckPreference = (SwitchPreference) findPreference(SYSTEM_PROXI_CHECK_ENABLED);
- if (!supportPowerButtonProxyCheck) {
- powerCategory.removePreference(proxyCheckPreference);
- }
}
@Override
public boolean onPreferenceTreeClick(Preference preference) {
- if (preference == mEnableNavBar) {
- boolean checked = ((SwitchPreference)preference).isChecked();
- Settings.System.putInt(getContentResolver(),
- Settings.System.NAVIGATION_BAR_SHOW, checked ? 1:0);
- return true;
- } else if (preference == mDisabkeHWKeys) {
- boolean checked = ((SwitchPreference)preference).isChecked();
- Settings.System.putInt(getContentResolver(),
- Settings.System.HARDWARE_KEYS_DISABLE, checked ? 1:0);
- return true;
- }
return super.onPreferenceTreeClick(preference);
}
@@ -211,36 +96,7 @@
}
int index = mNavbarRecentsStyle.findIndexOfValue((String) newValue);
mNavbarRecentsStyle.setSummary(mNavbarRecentsStyle.getEntries()[index]);
- Settings.System.putInt(getContentResolver(), Settings.System.NAVIGATION_BAR_RECENTS, value);
- return true;
- } else if (preference == mLongPressRecentsAction) {
- int value = Integer.valueOf((String) newValue);
- int index = mLongPressRecentsAction.findIndexOfValue((String) newValue);
- mLongPressRecentsAction.setSummary(mLongPressRecentsAction.getEntries()[index]);
- Settings.System.putInt(getContentResolver(), Settings.System.BUTTON_LONG_PRESS_RECENTS, value);
- return true;
- } else if (preference == mLongPressHomeAction) {
- int value = Integer.valueOf((String) newValue);
- int index = mLongPressHomeAction.findIndexOfValue((String) newValue);
- mLongPressHomeAction.setSummary(mLongPressHomeAction.getEntries()[index]);
- Settings.System.putInt(getContentResolver(), Settings.System.BUTTON_LONG_PRESS_HOME, value);
- return true;
- } else if (preference == mDoublePressHomeAction) {
- int value = Integer.valueOf((String) newValue);
- int index = mDoublePressHomeAction.findIndexOfValue((String) newValue);
- mDoublePressHomeAction.setSummary(mDoublePressHomeAction.getEntries()[index]);
- Settings.System.putInt(getContentResolver(), Settings.System.BUTTON_DOUBLE_PRESS_HOME, value);
- return true;
- } else if (preference == mBackKillTimeout) {
- int value = Integer.valueOf((String) newValue);
- int index = mBackKillTimeout.findIndexOfValue((String) newValue);
- mBackKillTimeout.setSummary(mBackKillTimeout.getEntries()[index]);
- Settings.System.putInt(getContentResolver(), Settings.System.BUTTON_BACK_KILL_TIMEOUT, value);
- return true;
- } else if (preference == mFingerprintVib) {
- boolean value = (Boolean) newValue;
- Settings.System.putInt(getActivity().getContentResolver(),
- Settings.System.FINGERPRINT_SUCCESS_VIB, value ? 1 : 0);
+ Settings.System.putInt(getContentResolver(), Settings.System.OMNI_NAVIGATION_BAR_RECENTS, value);
return true;
}
return false;
@@ -297,13 +153,13 @@
@Override
public List<String> getNonIndexableKeys(Context context) {
ArrayList<String> result = new ArrayList<String>();
- final Resources res = context.getResources();
+ /*final Resources res = context.getResources();
final int deviceKeys = res.getInteger(
com.android.internal.R.integer.config_deviceHardwareKeys);
if (deviceKeys == 0) {
result.add(CATEGORY_KEYS);
- }
+ }*/
return result;
}
};
diff --git a/src/org/omnirom/omnigears/DigitalClockSettings.java b/src/org/omnirom/omnigears/DigitalClockSettings.java
deleted file mode 100644
index 370d945..0000000
--- a/src/org/omnirom/omnigears/DigitalClockSettings.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.omnirom.omnigears;
-
-import com.android.settings.SettingsPreferenceFragment;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings;
-import android.provider.SearchIndexableResource;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import java.util.List;
-import java.util.Arrays;
-
-public class DigitalClockSettings extends SettingsPreferenceFragment implements Indexable {
- private static final String TAG = "DigitalClockSettings";
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.digital_clock_settings);
- }
-
- @Override
- public boolean onPreferenceTreeClick(Preference preference) {
- return super.onPreferenceTreeClick(preference);
- }
-
- /**
- * For Search.
- */
- public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
-
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(
- Context context, boolean enabled) {
- final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.digital_clock_settings;
- return Arrays.asList(sir);
- }
- };
-}
-
diff --git a/src/org/omnirom/omnigears/DisplayRotation.java b/src/org/omnirom/omnigears/DisplayRotation.java
deleted file mode 100644
index 1f6084b..0000000
--- a/src/org/omnirom/omnigears/DisplayRotation.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (C) 2012 The CyanogenMod Project
- * Copyright (C) 2017 The OmniROM Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.omnirom.omnigears;
-
-import android.content.Context;
-import android.database.ContentObserver;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-
-import com.android.internal.view.RotationPolicy;
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.Utils;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class DisplayRotation extends SettingsPreferenceFragment implements OnPreferenceChangeListener, Indexable {
- private static final String TAG = "DisplayRotation";
-
- private static final String KEY_ACCELEROMETER = "accelerometer";
- private static final String LOCKSCREEN_ROTATION = "lockscreen_rotation";
- private static final String ROTATION_0_PREF = "display_rotation_0";
- private static final String ROTATION_90_PREF = "display_rotation_90";
- private static final String ROTATION_180_PREF = "display_rotation_180";
- private static final String ROTATION_270_PREF = "display_rotation_270";
-
- private SwitchPreference mAccelerometer;
- private SwitchPreference mLockScreenRotationPref;
- private SwitchPreference mRotation0Pref;
- private SwitchPreference mRotation90Pref;
- private SwitchPreference mRotation180Pref;
- private SwitchPreference mRotation270Pref;
-
- public static final int ROTATION_0_MODE = 1;
- public static final int ROTATION_90_MODE = 2;
- public static final int ROTATION_180_MODE = 4;
- public static final int ROTATION_270_MODE = 8;
-
- private ContentObserver mAccelerometerRotationObserver = new ContentObserver(new Handler()) {
- @Override
- public void onChange(boolean selfChange) {
- updateAccelerometerRotationCheckbox();
- }
- };
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- addPreferencesFromResource(R.xml.display_rotation);
-
- PreferenceScreen prefSet = getPreferenceScreen();
-
- mAccelerometer = (SwitchPreference) findPreference(KEY_ACCELEROMETER);
- mLockScreenRotationPref = (SwitchPreference) prefSet.findPreference(LOCKSCREEN_ROTATION);
- mRotation0Pref = (SwitchPreference) prefSet.findPreference(ROTATION_0_PREF);
- mRotation90Pref = (SwitchPreference) prefSet.findPreference(ROTATION_90_PREF);
- mRotation180Pref = (SwitchPreference) prefSet.findPreference(ROTATION_180_PREF);
- mRotation270Pref = (SwitchPreference) prefSet.findPreference(ROTATION_270_PREF);
-
- int allowAllRotations = getResources().
- getBoolean(com.android.internal.R.bool.config_allowAllRotations) ? 1 : 0;
-
- int mode = Settings.System.getInt(getContentResolver(),
- Settings.System.ACCELEROMETER_ROTATION_ANGLES, -1);
-
- boolean configEnableLockRotation = getResources().
- getBoolean(com.android.internal.R.bool.config_enableLockScreenRotation);
- Boolean lockScreenRotationEnabled = Settings.System.getInt(getContentResolver(),
- Settings.System.LOCKSCREEN_ROTATION, configEnableLockRotation ? 1 : 0) != 0;
-
- if (mode < 0) {
- // defaults
- mode = allowAllRotations == 1 ?
- (ROTATION_0_MODE | ROTATION_90_MODE | ROTATION_180_MODE | ROTATION_270_MODE) : // All angles
- (ROTATION_0_MODE | ROTATION_90_MODE | ROTATION_270_MODE); // All except 180
- }
-
- mRotation0Pref.setChecked((mode & ROTATION_0_MODE) != 0);
- mRotation90Pref.setChecked((mode & ROTATION_90_MODE) != 0);
- mRotation180Pref.setChecked((mode & ROTATION_180_MODE) != 0);
- mRotation270Pref.setChecked((mode & ROTATION_270_MODE) != 0);
- mLockScreenRotationPref.setChecked(lockScreenRotationEnabled);
- }
-
- @Override
- public void onResume() {
- super.onResume();
-
- updateState();
- getContentResolver().registerContentObserver(
- Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION), true,
- mAccelerometerRotationObserver);
- }
-
- @Override
- public void onPause() {
- super.onPause();
-
- getContentResolver().unregisterContentObserver(mAccelerometerRotationObserver);
- }
-
- private void updateState() {
- updateAccelerometerRotationCheckbox();
- }
-
- private void updateAccelerometerRotationCheckbox() {
- mAccelerometer.setChecked(!RotationPolicy.isRotationLocked(getActivity()));
- }
-
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- return false;
- }
-
- public boolean onPreferenceTreeClick(Preference preference) {
- boolean value;
-
- if (preference == mAccelerometer) {
- RotationPolicy.setRotationLock(getActivity(), !mAccelerometer.isChecked());
- return true;
- } else if (preference == mRotation0Pref ||
- preference == mRotation90Pref ||
- preference == mRotation180Pref ||
- preference == mRotation270Pref) {
- int mode = 0;
- if (mRotation0Pref.isChecked())
- mode |= ROTATION_0_MODE;
- if (mRotation90Pref.isChecked())
- mode |= ROTATION_90_MODE;
- if (mRotation180Pref.isChecked())
- mode |= ROTATION_180_MODE;
- if (mRotation270Pref.isChecked())
- mode |= ROTATION_270_MODE;
- if (mode == 0) {
- mode |= ROTATION_0_MODE;
- mRotation0Pref.setChecked(true);
- }
- Settings.System.putInt(getContentResolver(),
- Settings.System.ACCELEROMETER_ROTATION_ANGLES, mode);
- return true;
- } else if (preference == mLockScreenRotationPref) {
- value = mLockScreenRotationPref.isChecked();
- Settings.System.putInt(getContentResolver(),
- Settings.System.LOCKSCREEN_ROTATION, value ? 1 : 0);
- return true;
- }
- return super.onPreferenceTreeClick(preference);
- }
-
- /**
- * For Search.
- */
- public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
-
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(
- Context context, boolean enabled) {
- final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.display_rotation;
- return Arrays.asList(sir);
- }
- };
-}
diff --git a/src/org/omnirom/omnigears/GestureSettings.java b/src/org/omnirom/omnigears/GestureSettings.java
deleted file mode 100644
index 23bee74..0000000
--- a/src/org/omnirom/omnigears/GestureSettings.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.omnirom.omnigears;
-
-import com.android.settings.SettingsPreferenceFragment;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings;
-import android.provider.SearchIndexableResource;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import java.util.List;
-import java.util.Arrays;
-
-public class GestureSettings extends SettingsPreferenceFragment implements Indexable {
- private static final String TAG = "GestureSettings";
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.gesture_settings);
- mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.gesture_settings_info);
- }
-
- @Override
- public boolean onPreferenceTreeClick(Preference preference) {
- return super.onPreferenceTreeClick(preference);
- }
-
- /**
- * For Search.
- */
- public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
-
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(
- Context context, boolean enabled) {
- final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.gesture_settings;
- return Arrays.asList(sir);
- }
- };
-}
-
diff --git a/src/org/omnirom/omnigears/OmniClockSettings.java b/src/org/omnirom/omnigears/OmniClockSettings.java
deleted file mode 100644
index 7fa667c..0000000
--- a/src/org/omnirom/omnigears/OmniClockSettings.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.omnirom.omnigears;
-
-import com.android.settings.SettingsPreferenceFragment;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings;
-import android.provider.SearchIndexableResource;
-
-import org.omnirom.omnilib.preference.ColorSelectPreference;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import java.util.List;
-import java.util.Arrays;
-
-public class OmniClockSettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, Indexable {
- private static final String TAG = "OmniClockSettings";
- private static final String KEY_BG_COLOR = "bg_color";
- private static final String KEY_BORDER_COLOR = "border_color";
- private static final String KEY_HOUR_COLOR = "hour_color";
- private static final String KEY_MINUTE_COLOR = "minute_color";
- private static final String KEY_TEXT_COLOR = "text_color";
- private static final String KEY_ACCENT_COLOR = "accent_color";
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.omni_clock_settings);
-
- PreferenceScreen prefSet = getPreferenceScreen();
- ContentResolver resolver = getContentResolver();
- Resources r = getResources();
-
- initColorPreference(KEY_BG_COLOR, Settings.System.LOCKSCREEN_OMNI_CLOCK_BG_COLOR,
- r.getColor(R.color.omni_clock_bg_color));
- initColorPreference(KEY_BORDER_COLOR, Settings.System.LOCKSCREEN_OMNI_CLOCK_BORDER_COLOR,
- r.getColor(R.color.omni_clock_primary));
- initColorPreference(KEY_HOUR_COLOR, Settings.System.LOCKSCREEN_OMNI_CLOCK_HOUR_COLOR,
- r.getColor(R.color.omni_clock_hour_hand_color));
- initColorPreference(KEY_MINUTE_COLOR, Settings.System.LOCKSCREEN_OMNI_CLOCK_MINUTE_COLOR,
- r.getColor(R.color.omni_clock_minute_hand_color));
- initColorPreference(KEY_TEXT_COLOR, Settings.System.LOCKSCREEN_OMNI_CLOCK_TEXT_COLOR,
- r.getColor(R.color.omni_clock_text_color));
- initColorPreference(KEY_ACCENT_COLOR, Settings.System.LOCKSCREEN_OMNI_CLOCK_ACCENT_COLOR,
- r.getColor(R.color.omni_clock_accent));
- }
-
- @Override
- public boolean onPreferenceTreeClick(Preference preference) {
- return super.onPreferenceTreeClick(preference);
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object objValue) {
- if (preference instanceof ColorSelectPreference) {
- ContentResolver resolver = getContentResolver();
- ColorSelectPreference c = (ColorSelectPreference) preference;
- String hexColor = String.format("#%08X", c.getColor());
- preference.setSummary(hexColor);
- String settingsKey = preference.getKey();
- Settings.System.putInt(resolver, settingsKey, c.getColor());
- return true;
- }
- return true;
- }
-
- private void initColorPreference(String key, String settingsKey, int defaultValue) {
- ContentResolver resolver = getContentResolver();
- ColorSelectPreference c = (ColorSelectPreference) findPreference(key);
- c.setKey(settingsKey);
- int color = Settings.System.getInt(resolver, settingsKey, defaultValue);
- c.setColor(color);
- String hexColor = String.format("#%08X", color);
- c.setSummary(hexColor);
- c.setOnPreferenceChangeListener(this);
- }
-
- /**
- * For Search.
- */
- public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
-
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(
- Context context, boolean enabled) {
- final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.omni_clock_settings;
- return Arrays.asList(sir);
- }
- };
-}
-
diff --git a/src/org/omnirom/omnigears/OmniDashboardFragment.java b/src/org/omnirom/omnigears/OmniDashboardFragment.java
index 318a600..5df098c 100644
--- a/src/org/omnirom/omnigears/OmniDashboardFragment.java
+++ b/src/org/omnirom/omnigears/OmniDashboardFragment.java
@@ -66,11 +66,6 @@
return R.xml.omni_dashboard_fragment;
}
- @Override
- protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
- return null;
- }
-
private static boolean isDevicePartsSupported(Context context) {
boolean devicePartsSupported = false;
try {
diff --git a/src/org/omnirom/omnigears/batterylight/BatteryLightSettings.java b/src/org/omnirom/omnigears/batterylight/BatteryLightSettings.java
deleted file mode 100644
index 57a2d32..0000000
--- a/src/org/omnirom/omnigears/batterylight/BatteryLightSettings.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright (C) 2012 The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.omnirom.omnigears.batterylight;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import org.omnirom.omnilib.preference.SystemSettingSwitchPreference;
-import org.omnirom.omnilib.preference.ColorSelectPreference;
-
-import java.util.List;
-import java.util.ArrayList;
-
-public class BatteryLightSettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, Indexable {
- private static final String TAG = "BatteryLightSettings";
-
- private static final String LOW_COLOR_PREF = "low_color";
- private static final String MEDIUM_COLOR_PREF = "medium_color";
- private static final String FULL_COLOR_PREF = "full_color";
- private static final String REALLY_FULL_COLOR_PREF = "really_full_color";
- private static final String KEY_CATEGORY_GENERAL = "general_section";
- private static final String FAST_COLOR_PREF = "fast_color";
- private static final String FAST_CHARGING_LED_PREF = "fast_charging_led_enabled";
- private static final String BATTERY_LIGHT_PREF = "battery_light_enabled";
- private static final String BATTERY_PULSE_PREF = "battery_light_pulse";
- private static final String BATTERY_LIGHT_ONLY_FULL_PREF = "battery_light_only_fully_charged";
- private static final String KEY_CATEGORY_FAST_CHARGE = "fast_color_cat";
- private static final String KEY_CATEGORY_CHARGE_COLORS = "colors_list";
-
- private boolean mMultiColorLed;
- private SystemSettingSwitchPreference mEnabledPref;
- private SystemSettingSwitchPreference mPulsePref;
- private SystemSettingSwitchPreference mOnlyFullPref;
- private SystemSettingSwitchPreference mFastBatteryLightEnabledPref;
- private PreferenceGroup mColorPrefs;
- private ColorSelectPreference mLowColorPref;
- private ColorSelectPreference mMediumColorPref;
- private ColorSelectPreference mFullColorPref;
- private ColorSelectPreference mReallyFullColorPref;
- private ColorSelectPreference mFastColorPref;
- private static final int MENU_RESET = Menu.FIRST;
- private int mLowBatteryWarningLevel;
- private boolean mBatteryLightEnabled;
- private boolean mFastBatteryLightEnabled;
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.battery_light_settings);
-
- PreferenceScreen prefSet = getPreferenceScreen();
- ContentResolver resolver = getContentResolver();
- mLowBatteryWarningLevel = getResources().getInteger(
- com.android.internal.R.integer.config_lowBatteryWarningLevel);
- mBatteryLightEnabled = getResources().getBoolean(
- com.android.internal.R.bool.config_intrusiveBatteryLed);
-
- mEnabledPref = (SystemSettingSwitchPreference)prefSet.findPreference(BATTERY_LIGHT_PREF);
- mEnabledPref.setChecked(Settings.System.getInt(resolver,
- Settings.System.BATTERY_LIGHT_ENABLED, mBatteryLightEnabled ? 1 : 0) != 0);
- mEnabledPref.setOnPreferenceChangeListener(this);
-
- mPulsePref = (SystemSettingSwitchPreference)prefSet.findPreference(BATTERY_PULSE_PREF);
- mPulsePref.setChecked(Settings.System.getInt(resolver,
- Settings.System.BATTERY_LIGHT_PULSE, mBatteryLightEnabled ? 1 : 0) != 0);
- mPulsePref.setOnPreferenceChangeListener(this);
-
- mOnlyFullPref = (SystemSettingSwitchPreference)prefSet.findPreference(BATTERY_LIGHT_ONLY_FULL_PREF);
- mOnlyFullPref.setOnPreferenceChangeListener(this);
-
- // Does the Device support changing battery LED colors?
- if (getResources().getBoolean(com.android.internal.R.bool.config_multiColorBatteryLed)) {
- setHasOptionsMenu(true);
-
- // Low, Medium and full color preferences
- mLowColorPref = (ColorSelectPreference) prefSet.findPreference(LOW_COLOR_PREF);
- mLowColorPref.setOnPreferenceChangeListener(this);
-
- mMediumColorPref = (ColorSelectPreference) prefSet.findPreference(MEDIUM_COLOR_PREF);
- mMediumColorPref.setOnPreferenceChangeListener(this);
-
- mFullColorPref = (ColorSelectPreference) prefSet.findPreference(FULL_COLOR_PREF);
- mFullColorPref.setOnPreferenceChangeListener(this);
-
- mReallyFullColorPref = (ColorSelectPreference) prefSet.findPreference(REALLY_FULL_COLOR_PREF);
- mReallyFullColorPref.setOnPreferenceChangeListener(this);
-
- mFastBatteryLightEnabledPref = (SystemSettingSwitchPreference)prefSet.findPreference(FAST_CHARGING_LED_PREF);
-
- mFastColorPref = (ColorSelectPreference) prefSet.findPreference(FAST_COLOR_PREF);
- mFastColorPref.setOnPreferenceChangeListener(this);
-
- // Does the Device support fast charge ?
- if (!getResources().getBoolean(com.android.internal.R.bool.config_FastChargingLedSupported)) {
- prefSet.removePreference(prefSet.findPreference(KEY_CATEGORY_FAST_CHARGE));
- }
- } else {
- prefSet.removePreference(prefSet.findPreference(KEY_CATEGORY_CHARGE_COLORS));
- // not multi color cant have fast charge
- prefSet.removePreference(prefSet.findPreference(KEY_CATEGORY_FAST_CHARGE));
- }
- boolean showOnlyWhenFull = Settings.System.getInt(resolver,
- Settings.System.BATTERY_LIGHT_ONLY_FULLY_CHARGED, 0) != 0;
- updateEnablement(showOnlyWhenFull);
- }
-
- @Override
- public void onResume() {
- super.onResume();
- refreshDefault();
- }
-
- private void refreshDefault() {
- ContentResolver resolver = getContentResolver();
- Resources res = getResources();
-
- if (mLowColorPref != null) {
- int lowColor = Settings.System.getInt(resolver, Settings.System.BATTERY_LIGHT_LOW_COLOR,
- res.getInteger(com.android.internal.R.integer.config_notificationsBatteryLowARGB));
- mLowColorPref.setColor(lowColor);
- }
-
- if (mMediumColorPref != null) {
- int mediumColor = Settings.System.getInt(resolver, Settings.System.BATTERY_LIGHT_MEDIUM_COLOR,
- res.getInteger(com.android.internal.R.integer.config_notificationsBatteryMediumARGB));
- mMediumColorPref.setColor(mediumColor);
- }
-
- if (mFullColorPref != null) {
- int fullColor = Settings.System.getInt(resolver, Settings.System.BATTERY_LIGHT_FULL_COLOR,
- res.getInteger(com.android.internal.R.integer.config_notificationsBatteryFullARGB));
- mFullColorPref.setColor(fullColor);
- }
-
- if (mReallyFullColorPref != null) {
- int reallyFullColor = Settings.System.getInt(resolver, Settings.System.BATTERY_LIGHT_REALLY_FULL_COLOR,
- res.getInteger(com.android.internal.R.integer.config_notificationsBatteryFullARGB));
- mReallyFullColorPref.setColor(reallyFullColor);
- }
-
- if (mFastColorPref != null) {
- int fastColor = Settings.System.getInt(resolver, Settings.System.FAST_BATTERY_LIGHT_COLOR,
- res.getInteger(com.android.internal.R.integer.config_notificationsFastBatteryARGB));
- mFastColorPref.setColor(fastColor);
- }
- }
-
- /**
- * Updates the default or application specific notification settings.
- *
- * @param key of the specific setting to update
- * @param color
- */
- protected void updateValues(String key, Integer color) {
- ContentResolver resolver = getContentResolver();
-
- if (key.equals(LOW_COLOR_PREF)) {
- Settings.System.putInt(resolver, Settings.System.BATTERY_LIGHT_LOW_COLOR, color);
- } else if (key.equals(MEDIUM_COLOR_PREF)) {
- Settings.System.putInt(resolver, Settings.System.BATTERY_LIGHT_MEDIUM_COLOR, color);
- } else if (key.equals(FULL_COLOR_PREF)) {
- Settings.System.putInt(resolver, Settings.System.BATTERY_LIGHT_FULL_COLOR, color);
- } else if (key.equals(REALLY_FULL_COLOR_PREF)) {
- Settings.System.putInt(resolver, Settings.System.BATTERY_LIGHT_REALLY_FULL_COLOR, color);
- } else if (key.equals(FAST_COLOR_PREF)) {
- Settings.System.putInt(resolver, Settings.System.FAST_BATTERY_LIGHT_COLOR, color);
- }
- }
-
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- menu.add(0, MENU_RESET, 0, R.string.reset)
- .setIcon(R.drawable.ic_settings_backup_restore)
- .setAlphabeticShortcut('r')
- .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case MENU_RESET:
- resetToDefaults();
- return true;
- }
- return false;
- }
-
- protected void resetColors() {
- ContentResolver resolver = getActivity().getContentResolver();
- Resources res = getResources();
-
- // Reset to the framework default colors
- Settings.System.putInt(resolver, Settings.System.BATTERY_LIGHT_LOW_COLOR,
- res.getInteger(com.android.internal.R.integer.config_notificationsBatteryLowARGB));
- Settings.System.putInt(resolver, Settings.System.BATTERY_LIGHT_MEDIUM_COLOR,
- res.getInteger(com.android.internal.R.integer.config_notificationsBatteryMediumARGB));
- Settings.System.putInt(resolver, Settings.System.BATTERY_LIGHT_FULL_COLOR,
- res.getInteger(com.android.internal.R.integer.config_notificationsBatteryFullARGB));
- Settings.System.putInt(resolver, Settings.System.BATTERY_LIGHT_REALLY_FULL_COLOR,
- res.getInteger(com.android.internal.R.integer.config_notificationsBatteryFullARGB));
- Settings.System.putInt(resolver, Settings.System.FAST_BATTERY_LIGHT_COLOR,
- res.getInteger(com.android.internal.R.integer.config_notificationsFastBatteryARGB));
- refreshDefault();
- }
-
- protected void resetToDefaults() {
- if (mEnabledPref != null) mEnabledPref.setChecked(true);
- if (mPulsePref != null) mPulsePref.setChecked(false);
- if (mOnlyFullPref != null) mOnlyFullPref.setChecked(false);
- if (mFastBatteryLightEnabledPref != null) mFastBatteryLightEnabledPref.setChecked(false);
- resetColors();
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object objValue) {
- if (preference == mEnabledPref) {
- boolean value = (Boolean) objValue;
- Settings.System.putInt(getActivity().getContentResolver(),
- Settings.System.BATTERY_LIGHT_ENABLED, value ? 1:0);
- } else if (preference == mPulsePref) {
- boolean value = (Boolean) objValue;
- Settings.System.putInt(getActivity().getContentResolver(),
- Settings.System.BATTERY_LIGHT_PULSE, value ? 1:0);
- } else if (preference == mOnlyFullPref) {
- boolean value = (Boolean) objValue;
- // If enabled, disable all but really full color preference.
- updateEnablement(value);
- } else {
- ColorSelectPreference lightPref = (ColorSelectPreference) preference;
- updateValues(lightPref.getKey(), lightPref.getColor());
- }
- return true;
- }
-
- private void updateEnablement(boolean showOnlyWhenFull) {
- // If enabled, disable all but really full color preference.
- if (mLowColorPref != null) {
- mLowColorPref.setEnabled(!showOnlyWhenFull);
- }
- if (mMediumColorPref != null) {
- mMediumColorPref.setEnabled(!showOnlyWhenFull);
- }
- if (mFullColorPref != null) {
- mFullColorPref.setEnabled(!showOnlyWhenFull);
- }
- if (mFastColorPref != null) {
- mFastColorPref.setEnabled(!showOnlyWhenFull);
- }
- if (mFastBatteryLightEnabledPref != null) {
- mFastBatteryLightEnabledPref.setEnabled(!showOnlyWhenFull);
- }
- }
-
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- ArrayList<SearchIndexableResource> result =
- new ArrayList<SearchIndexableResource>();
-
- SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.battery_light_settings;
- result.add(sir);
- return result;
- }
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- ArrayList<String> result = new ArrayList<String>();
- final Resources res = context.getResources();
- if (!res.getBoolean(com.android.internal.R.bool.config_intrusiveBatteryLed)) {
- result.add(BATTERY_LIGHT_PREF);
- result.add(BATTERY_PULSE_PREF);
- result.add(BATTERY_LIGHT_ONLY_FULL_PREF);
- }
- if (!res.getBoolean(com.android.internal.R.bool.config_multiColorBatteryLed)) {
- result.add(LOW_COLOR_PREF);
- result.add(MEDIUM_COLOR_PREF);
- result.add(FULL_COLOR_PREF);
- result.add(REALLY_FULL_COLOR_PREF);
- }
- if (!res.getBoolean(com.android.internal.R.bool.config_FastChargingLedSupported)) {
- result.add(FAST_CHARGING_LED_PREF);
- result.add(FAST_COLOR_PREF);
- }
- return result;
- }
- };
-}
diff --git a/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java b/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
deleted file mode 100644
index d6a555c..0000000
--- a/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (C) 2017 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
-*/
-package org.omnirom.omnigears.interfacesettings;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.net.TrafficStats;
-import android.os.Bundle;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-import android.text.TextUtils;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.PreferenceCategory;
-
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import org.omnirom.omnilib.preference.AppMultiSelectListPreference;
-import org.omnirom.omnilib.preference.ScrollAppsViewPreference;
-import org.omnirom.omnilib.preference.SeekBarPreference;
-
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public class BarsSettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, Indexable {
- private static final String TAG = "BarsSettings";
- private static final String NETWORK_TRAFFIC_ROOT = "category_network_traffic";
- private static final String NAVIGATIONBAR_ROOT = "category_navigationbar";
- private static final String EXPANDED_DESKTOP_CATEGORY = "expanded_desktop_category";
- private static final String QUICK_PULLDOWN = "quick_pulldown";
- private static final String KEY_ASPECT_RATIO_APPS_ENABLED = "aspect_ratio_apps_enabled";
- private static final String KEY_ASPECT_RATIO_APPS_LIST = "aspect_ratio_apps_list";
- private static final String KEY_ASPECT_RATIO_CATEGORY = "aspect_ratio_category";
- private static final String KEY_ASPECT_RATIO_APPS_LIST_SCROLLER = "aspect_ratio_apps_list_scroller";
- private static final String QS_PANEL_ALPHA = "qs_panel_alpha";
-
- private ListPreference mQuickPulldown;
- private AppMultiSelectListPreference mAspectRatioAppsSelect;
- private ScrollAppsViewPreference mAspectRatioApps;
- private SeekBarPreference mQsPanelAlpha;
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.bars_settings);
-
- PreferenceScreen prefScreen = getPreferenceScreen();
-
- mQuickPulldown = (ListPreference) findPreference(QUICK_PULLDOWN);
- mQuickPulldown.setOnPreferenceChangeListener(this);
- int quickPulldownValue = Settings.System.getInt(getContentResolver(),
- Settings.System.STATUS_BAR_QUICK_QS_PULLDOWN, 0);
- mQuickPulldown.setValue(String.valueOf(quickPulldownValue));
- updatePulldownSummary(quickPulldownValue);
-
- // Navigationbar catagory will not be displayed when the device is not a tablet
- // or the device has physical keys
- /*if (!DeviceUtils.deviceSupportNavigationBar(getActivity())) {
- prefScreen.removePreference(findPreference(NAVIGATIONBAR_ROOT));
- }*/
-
- // TrafficStats will return UNSUPPORTED if the device does not support it.
- if (TrafficStats.getTotalTxBytes() == TrafficStats.UNSUPPORTED ||
- TrafficStats.getTotalRxBytes() == TrafficStats.UNSUPPORTED) {
- prefScreen.removePreference(findPreference(NETWORK_TRAFFIC_ROOT));
- }
-
- mQsPanelAlpha = (SeekBarPreference) findPreference(QS_PANEL_ALPHA);
- int qsPanelAlpha = Settings.System.getInt(getContentResolver(),
- Settings.System.QS_PANEL_BG_ALPHA, 221);
- mQsPanelAlpha.setValue((int)(((double) qsPanelAlpha / 255) * 100));
- mQsPanelAlpha.setOnPreferenceChangeListener(this);
-
- final PreferenceCategory aspectRatioCategory =
- (PreferenceCategory) getPreferenceScreen().findPreference(KEY_ASPECT_RATIO_CATEGORY);
- final boolean supportMaxAspectRatio = getResources().getBoolean(com.android.internal.R.bool.config_haveHigherAspectRatioScreen);
- if (!supportMaxAspectRatio) {
- getPreferenceScreen().removePreference(aspectRatioCategory);
- } else {
- mAspectRatioAppsSelect = (AppMultiSelectListPreference) findPreference(KEY_ASPECT_RATIO_APPS_LIST);
- mAspectRatioApps = (ScrollAppsViewPreference) findPreference(KEY_ASPECT_RATIO_APPS_LIST_SCROLLER);
- final String valuesString = Settings.System.getString(getContentResolver(), Settings.System.ASPECT_RATIO_APPS_LIST);
- List<String> valuesList = new ArrayList<String>();
- if (!TextUtils.isEmpty(valuesString)) {
- valuesList.addAll(Arrays.asList(valuesString.split(":")));
- mAspectRatioApps.setVisible(true);
- mAspectRatioApps.setValues(valuesList);
- } else {
- mAspectRatioApps.setVisible(false);
- }
- mAspectRatioAppsSelect.setValues(valuesList);
- mAspectRatioAppsSelect.setOnPreferenceChangeListener(this);
- }
- }
-
- @Override
- public boolean onPreferenceTreeClick(Preference preference) {
- return super.onPreferenceTreeClick(preference);
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (preference == mQuickPulldown) {
- int quickPulldownValue = Integer.valueOf((String) newValue);
- Settings.System.putInt(getContentResolver(), Settings.System.STATUS_BAR_QUICK_QS_PULLDOWN,
- quickPulldownValue);
- updatePulldownSummary(quickPulldownValue);
- return true;
- } else if (preference == mAspectRatioAppsSelect) {
- Collection<String> valueList = (Collection<String>) newValue;
- mAspectRatioApps.setVisible(false);
- if (valueList != null) {
- Settings.System.putString(getContentResolver(), Settings.System.ASPECT_RATIO_APPS_LIST,
- TextUtils.join(":", valueList));
- mAspectRatioApps.setVisible(true);
- mAspectRatioApps.setValues(valueList);
- } else {
- Settings.System.putString(getContentResolver(), Settings.System.ASPECT_RATIO_APPS_LIST, "");
- }
- return true;
- } else if (preference == mQsPanelAlpha) {
- int bgAlpha = (Integer) newValue;
- int trueValue = (int) (((double) bgAlpha / 100) * 255);
- Settings.System.putInt(getContentResolver(),
- Settings.System.QS_PANEL_BG_ALPHA, trueValue);
- return true;
- }
- return false;
- }
-
- private void updatePulldownSummary(int value) {
- Resources res = getResources();
- if (value == 0) {
- // Quick Pulldown deactivated
- mQuickPulldown.setSummary(res.getString(R.string.quick_pulldown_off));
- } else if (value == 3) {
- // Quick Pulldown always
- mQuickPulldown.setSummary(res.getString(R.string.quick_pulldown_summary_always));
- } else {
- String direction = res.getString(value == 2
- ? R.string.quick_pulldown_left
- : R.string.quick_pulldown_right);
- mQuickPulldown.setSummary(res.getString(R.string.quick_pulldown_summary, direction));
- }
- }
-
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- ArrayList<SearchIndexableResource> result =
- new ArrayList<SearchIndexableResource>();
-
- SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.bars_settings;
- result.add(sir);
-
- return result;
- }
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- ArrayList<String> result = new ArrayList<String>();
- return result;
- }
- };
-}
diff --git a/src/org/omnirom/omnigears/interfacesettings/ExpandedDesktop.java b/src/org/omnirom/omnigears/interfacesettings/ExpandedDesktop.java
deleted file mode 100644
index 94063de..0000000
--- a/src/org/omnirom/omnigears/interfacesettings/ExpandedDesktop.java
+++ /dev/null
@@ -1,624 +0,0 @@
-/*
- * Copyright (C) 2015 The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.omnirom.omnigears.interfacesettings;
-
-import android.annotation.Nullable;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.Bundle;
-import android.os.RemoteException;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-import android.provider.Settings.SettingNotFoundException;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManagerGlobal;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.SectionIndexer;
-import android.widget.Spinner;
-import android.widget.Switch;
-import android.widget.TextView;
-import android.view.WindowManagerPolicyControl;
-
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.widget.SwitchBar;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-
-import com.android.settings.Utils;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ExpandedDesktop extends SettingsPreferenceFragment implements
- ApplicationsState.Callbacks, SwitchBar.OnSwitchChangeListener {
-
- private static final int STATE_DISABLED = 0;
- private static final int STATE_STATUS_HIDDEN = 1;
- private static final int STATE_NAVIGATION_HIDDEN = 2;
- private static final int STATE_BOTH_HIDDEN = 3;
-
- private static final int STATE_ENABLE_FOR_ALL = 0;
- private static final int STATE_USER_CONFIGURABLE = 1;
-
- private AllPackagesAdapter mAllPackagesAdapter;
- private ApplicationsState mApplicationsState;
- private View mEmptyView;
- private View mProgressBar;
- private ListView mUserListView;
- private ApplicationsState.Session mSession;
- private ActivityFilter mActivityFilter;
- private Map<String, ApplicationsState.AppEntry> mEntryMap =
- new HashMap<String, ApplicationsState.AppEntry>();
- private int mExpandedDesktopState;
- private SwitchBar mSwitchBar;
- private boolean mOnlyLauncher = true;
- private MenuItem mMenuItem;
-
- private int getExpandedDesktopState(ContentResolver cr) {
- boolean enableForAll = Settings.Global.getInt(getContentResolver(),
- Settings.Global.OVERRIDE_POLICY_CONTROL, 0) == 1;
- if (enableForAll) {
- return STATE_ENABLE_FOR_ALL;
- }
- String value = Settings.Global.getString(cr, Settings.Global.POLICY_CONTROL);
- if ("immersive.full=*".equals(value)) {
- return STATE_ENABLE_FOR_ALL;
- }
- return STATE_USER_CONFIGURABLE;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- mApplicationsState = ApplicationsState.getInstance(getActivity().getApplication());
- mSession = mApplicationsState.newSession(this);
- mSession.resume();
- mActivityFilter = new ActivityFilter(getActivity().getPackageManager());
-
- mExpandedDesktopState = getExpandedDesktopState(getActivity().getContentResolver());
- if (mExpandedDesktopState == STATE_USER_CONFIGURABLE) {
- WindowManagerPolicyControl.reloadFromSetting(getActivity(),
- Settings.Global.POLICY_CONTROL);
- }
- mAllPackagesAdapter = new AllPackagesAdapter(getActivity());
-
- setHasOptionsMenu(true);
- }
-
- @Override
- public void onResume() {
- super.onResume();
- rebuild();
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.expanded_desktop_prefs, container, false);
- mUserListView = (ListView) view.findViewById(R.id.user_list_view);
- mUserListView.setAdapter(mAllPackagesAdapter);
- mUserListView.setFastScrollEnabled(true);
-
- mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
- mSwitchBar.setOnStateOffLabel(R.string.expanded_enabled_for_all);
- mSwitchBar.setOnStateOnLabel(R.string.expanded_enabled_for_all);
- mSwitchBar.show();
-
- mEmptyView = view.findViewById(R.id.nothing_to_show);
- mProgressBar = view.findViewById(R.id.progress_bar);
-
- if (mExpandedDesktopState == STATE_USER_CONFIGURABLE) {
- mSwitchBar.setChecked(false);
- showListView();
- } else {
- mSwitchBar.setChecked(true);
- hideListView();
- }
- mSwitchBar.addOnSwitchChangeListener(this);
- return view;
- }
-
- @Override
- public void onDestroy() {
- super.onDestroy();
- save();
- mSession.pause();
- mSession.release();
- }
-
- @Override
- public void onDestroyView() {
- super.onDestroyView();
- if (mSwitchBar != null) {
- mSwitchBar.removeOnSwitchChangeListener(this);
- }
- }
-
- private void enableForAll() {
- mExpandedDesktopState = STATE_ENABLE_FOR_ALL;
- //writeValue("immersive.full=*");
- Settings.Global.putInt(getContentResolver(),
- Settings.Global.OVERRIDE_POLICY_CONTROL, 1);
- mAllPackagesAdapter.notifyDataSetChanged();
- hideListView();
- }
-
- private void userConfigurableSettings() {
- mExpandedDesktopState = STATE_USER_CONFIGURABLE;
- //writeValue("");
- Settings.Global.putInt(getContentResolver(),
- Settings.Global.OVERRIDE_POLICY_CONTROL, 0);
- WindowManagerPolicyControl.reloadFromSetting(getActivity());
- mAllPackagesAdapter.notifyDataSetChanged();
- showListView();
- }
-
- private void hideListView() {
- mUserListView.setVisibility(View.GONE);
- mEmptyView.setVisibility(View.VISIBLE);
- }
-
- private void showListView() {
- mUserListView.setVisibility(View.VISIBLE);
- mEmptyView.setVisibility(View.GONE);
- }
-
- /*private void writeValue(String value) {
- Settings.Global.putString(getContentResolver(), Settings.Global.POLICY_CONTROL, value);
- }*/
-
- private static int getStateForPackage(String packageName) {
- int state = STATE_DISABLED;
-
- if (WindowManagerPolicyControl.immersiveStatusFilterMatches(packageName)) {
- state = STATE_STATUS_HIDDEN;
- }
- if (WindowManagerPolicyControl.immersiveNavigationFilterMatches(packageName)) {
- if (state == STATE_DISABLED) {
- state = STATE_NAVIGATION_HIDDEN;
- } else {
- state = STATE_BOTH_HIDDEN;
- }
- }
-
- return state;
- }
-
- @Override
- public void onRunningStateChanged(boolean running) {
- }
-
- @Override
- public void onPackageListChanged() {
- mActivityFilter.updateLauncherInfoList();
- rebuild();
- }
-
- @Override
- public void onRebuildComplete(ArrayList<ApplicationsState.AppEntry> entries) {
- if (entries != null) {
- handleAppEntries(entries);
- mAllPackagesAdapter.notifyDataSetChanged();
- }
- }
-
- @Override
- public void onPackageIconChanged() {
- }
-
- @Override
- public void onPackageSizeChanged(String packageName) {
- }
-
- @Override
- public void onAllSizesComputed() {
- }
-
- private void handleAppEntries(List<ApplicationsState.AppEntry> entries) {
- String lastSectionIndex = null;
- ArrayList<String> sections = new ArrayList<String>();
- ArrayList<Integer> positions = new ArrayList<Integer>();
- PackageManager pm = getPackageManager();
- int count = entries.size(), offset = 0;
-
- for (int i = 0; i < count; i++) {
- ApplicationInfo info = entries.get(i).info;
- String label = (String) info.loadLabel(pm);
- String sectionIndex;
-
- if (!info.enabled) {
- sectionIndex = "--";
- } else if (TextUtils.isEmpty(label)) {
- sectionIndex = "";
- } else {
- sectionIndex = label.substring(0, 1).toUpperCase();
- }
-
- if (lastSectionIndex == null ||
- !TextUtils.equals(sectionIndex, lastSectionIndex)) {
- sections.add(sectionIndex);
- positions.add(offset);
- lastSectionIndex = sectionIndex;
- }
- offset++;
- }
-
- mAllPackagesAdapter.setEntries(entries, sections, positions);
- mEntryMap.clear();
- for (ApplicationsState.AppEntry e : entries) {
- mEntryMap.put(e.info.packageName, e);
- }
- }
-
- private void rebuild() {
- mSession.rebuild(mActivityFilter, ApplicationsState.ALPHA_COMPARATOR);
- }
-
- private void save() {
- if (mExpandedDesktopState == STATE_USER_CONFIGURABLE) {
- WindowManagerPolicyControl.saveToSettings(getActivity(),
- Settings.Global.POLICY_CONTROL);
- }
- }
-
- int getStateDrawable(int state) {
- switch (state) {
- case STATE_STATUS_HIDDEN:
- return R.drawable.ic_expanded_desktop_hidestatusbar;
- case STATE_NAVIGATION_HIDDEN:
- return R.drawable.ic_expanded_desktop_hidenavbar;
- case STATE_BOTH_HIDDEN:
- return R.drawable.ic_expanded_desktop_hideboth;
- case STATE_DISABLED:
- default:
- return R.drawable.ic_expanded_desktop_hidenone;
- }
- }
-
- @Override
- public void onSwitchChanged(Switch switchView, boolean isChecked) {
- if (isChecked) {
- enableForAll();
- } else {
- userConfigurableSettings();
- }
- }
-
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- inflater.inflate(R.menu.expanded_desktop_menu, menu);
- mMenuItem = menu.findItem(R.id.show_all_apps);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.show_all_apps:
- mOnlyLauncher = !mOnlyLauncher;
- mActivityFilter.updateLauncherInfoList();
- rebuild();
- break;
- }
- return super.onOptionsItemSelected(item);
- }
-
- @Override
- public void onPrepareOptionsMenu (Menu menu) {
- super.onPrepareOptionsMenu(menu);
- if (mMenuItem != null) {
- mMenuItem.setTitle(mOnlyLauncher ? getResources().getString(R.string.show_all_apps_menu)
- : getResources().getString(R.string.show_only_launcher_menu));
- }
- }
-
- private class AllPackagesAdapter extends BaseAdapter
- implements AdapterView.OnItemSelectedListener, SectionIndexer {
-
- private final LayoutInflater inflater;
- private List<ApplicationsState.AppEntry> entries = new ArrayList<>();
- private final ModeAdapter mModesAdapter;
- private String[] mSections;
- private int[] mPositions;
-
- public AllPackagesAdapter(Context context) {
- this.inflater = LayoutInflater.from(context);
- mModesAdapter = new ModeAdapter(context);
- mActivityFilter = new ActivityFilter(context.getPackageManager());
- }
-
- @Override
- public int getCount() {
- return entries.size();
- }
-
- @Override
- public Object getItem(int position) {
- return entries.get(position);
- }
-
- @Override
- public boolean hasStableIds() {
- return true;
- }
-
- @Override
- public long getItemId(int position) {
- return entries.get(position).id;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- ViewHolder holder;
- if (convertView == null) {
- holder = new ViewHolder(inflater.inflate(R.layout.expanded_item, parent, false));
- holder.mode.setAdapter(mModesAdapter);
- holder.mode.setOnItemSelectedListener(this);
- } else {
- holder = (ViewHolder) convertView.getTag();
- }
-
- ApplicationsState.AppEntry entry = entries.get(position);
-
- if (entry == null) {
- return holder.rootView;
- }
-
- holder.title.setText(entry.label);
- mApplicationsState.ensureIcon(entry);
- holder.icon.setImageDrawable(entry.icon);
- holder.mode.setSelection(getStateForPackage(entry.info.packageName), false);
- holder.mode.setTag(entry);
- holder.stateIcon.setImageResource(getStateDrawable(
- getStateForPackage(entry.info.packageName)));
- return holder.rootView;
- }
-
- private void setEntries(List<ApplicationsState.AppEntry> entries,
- List<String> sections, List<Integer> positions) {
- this.entries = entries;
- mSections = sections.toArray(new String[sections.size()]);
- mPositions = new int[positions.size()];
- for (int i = 0; i < positions.size(); i++) {
- mPositions[i] = positions.get(i);
- }
- notifyDataSetChanged();
- }
-
-
- @Override
- public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
- ApplicationsState.AppEntry entry = (ApplicationsState.AppEntry) parent.getTag();
-
- WindowManagerPolicyControl.removeFromWhiteLists(entry.info.packageName);
- switch (position) {
- case STATE_STATUS_HIDDEN:
- WindowManagerPolicyControl.addToStatusWhiteList(entry.info.packageName);
- break;
- case STATE_NAVIGATION_HIDDEN:
- WindowManagerPolicyControl.addToNavigationWhiteList(entry.info.packageName);
- break;
- case STATE_BOTH_HIDDEN:
- WindowManagerPolicyControl.addToStatusWhiteList(entry.info.packageName);
- WindowManagerPolicyControl.addToNavigationWhiteList(entry.info.packageName);
- break;
- }
- save();
- notifyDataSetChanged();
- }
-
- @Override
- public void onNothingSelected(AdapterView<?> parent) {
- }
-
- @Override
- public int getPositionForSection(int section) {
- if (section < 0 || section >= mSections.length) {
- return -1;
- }
-
- return mPositions[section];
- }
-
- @Override
- public int getSectionForPosition(int position) {
- if (position < 0 || position >= getCount()) {
- return -1;
- }
-
- int index = Arrays.binarySearch(mPositions, position);
-
- /*
- * Consider this example: section positions are 0, 3, 5; the supplied
- * position is 4. The section corresponding to position 4 starts at
- * position 3, so the expected return value is 1. Binary search will not
- * find 4 in the array and thus will return -insertPosition-1, i.e. -3.
- * To get from that number to the expected value of 1 we need to negate
- * and subtract 2.
- */
- return index >= 0 ? index : -index - 2;
- }
-
- @Override
- public Object[] getSections() {
- return mSections;
- }
- }
-
- private static class ViewHolder {
- private TextView title;
- private Spinner mode;
- private ImageView icon;
- private View rootView;
- private ImageView stateIcon;
-
- private ViewHolder(View view) {
- this.title = (TextView) view.findViewById(R.id.app_name);
- this.mode = (Spinner) view.findViewById(R.id.app_mode);
- this.icon = (ImageView) view.findViewById(R.id.app_icon);
- this.stateIcon = (ImageView) view.findViewById(R.id.state);
- this.rootView = view;
-
- view.setTag(this);
- }
- }
-
- private static class ModeAdapter extends BaseAdapter {
-
- private final LayoutInflater inflater;
- private boolean hasNavigationBar = true;
- private final int[] items = {R.string.expanded_hide_nothing, R.string.expanded_hide_status,
- R.string.expanded_hide_navigation, R.string.expanded_hide_both};
-
- private ModeAdapter(Context context) {
- inflater = LayoutInflater.from(context);
-
- try {
- hasNavigationBar = WindowManagerGlobal.getWindowManagerService().hasNavigationBar();
- } catch (RemoteException e) {
- // Do nothing
- }
- }
-
- @Override
- public int getCount() {
- return hasNavigationBar ? 4 : 2;
- }
-
- @Override
- public Object getItem(int position) {
- return items[position];
- }
-
- @Override
- public long getItemId(int position) {
- return 0;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- TextView view;
- if (convertView != null) {
- view = (TextView) convertView;
- } else {
- view = (TextView) inflater.inflate(android.R.layout.simple_spinner_dropdown_item,
- parent, false);
- }
-
- view.setText(items[position]);
-
- return view;
- }
- }
-
- private class ActivityFilter implements ApplicationsState.AppFilter {
-
- private final PackageManager mPackageManager;
- private final List<String> launcherResolveInfoList = new ArrayList<String>();
-
- private ActivityFilter(PackageManager packageManager) {
- this.mPackageManager = packageManager;
-
- updateLauncherInfoList();
- }
-
- public void updateLauncherInfoList() {
- Intent i = new Intent(Intent.ACTION_MAIN);
- i.addCategory(Intent.CATEGORY_LAUNCHER);
- List<ResolveInfo> resolveInfoList = mPackageManager.queryIntentActivities(i, 0);
-
- synchronized (launcherResolveInfoList) {
- launcherResolveInfoList.clear();
- for (ResolveInfo ri : resolveInfoList) {
- launcherResolveInfoList.add(ri.activityInfo.packageName);
- }
- }
- }
-
- @Override
- public void init() {
- }
-
- @Override
- public boolean filterApp(AppEntry info) {
- boolean show = !mAllPackagesAdapter.entries.contains(info.info.packageName);
- if (show && mOnlyLauncher) {
- synchronized (launcherResolveInfoList) {
- show = launcherResolveInfoList.contains(info.info.packageName);
- }
- }
- return show;
- }
- }
-
- @Override
- public void onLauncherInfoChanged() {
- }
-
- @Override
- public void onLoadEntriesCompleted() {
- rebuild();
- }
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- ArrayList<SearchIndexableResource> result =
- new ArrayList<SearchIndexableResource>();
-
- SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.network_traffic;
- result.add(sir);
-
- return result;
- }
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- ArrayList<String> result = new ArrayList<String>();
- return result;
- }
- };
-}
diff --git a/src/org/omnirom/omnigears/interfacesettings/GlobalActionsSettings.java b/src/org/omnirom/omnigears/interfacesettings/GlobalActionsSettings.java
deleted file mode 100644
index 5f47393..0000000
--- a/src/org/omnirom/omnigears/interfacesettings/GlobalActionsSettings.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2016 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
-*/
-package org.omnirom.omnigears.interfacesettings;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.omnirom.omnilib.preference.SecureSettingSwitchPreference;
-
-public class GlobalActionsSettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, Indexable {
- private static final String TAG = "GlobalActionsSettings";
-
- private SecureSettingSwitchPreference mAdvancedReboot;
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.global_actions);
-
- final PreferenceScreen prefScreen = getPreferenceScreen();
- final ContentResolver contentResolver = getContext().getContentResolver();
-
- mAdvancedReboot = (SecureSettingSwitchPreference)
- findPreference(Settings.Secure.ADVANCED_REBOOT);
- mAdvancedReboot.setOnPreferenceChangeListener(this);
- }
-
- @Override
- public boolean onPreferenceTreeClick(Preference preference) {
- return super.onPreferenceTreeClick(preference);
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object objValue) {
- boolean result = false;
- if (preference instanceof SecureSettingSwitchPreference) {
- if (preference == mAdvancedReboot) {
- boolean value = (Boolean) objValue;
- Settings.Secure.putInt(getContentResolver(), Settings.Secure.ADVANCED_REBOOT,
- value ? 1:0);
- Settings.Secure.putInt(getContentResolver(), Settings.Secure.GLOBAL_ACTION_DNAA,
- value ? 1:0);
- }
- return true;
- }
- return result;
- }
-
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- ArrayList<SearchIndexableResource> result =
- new ArrayList<SearchIndexableResource>();
-
- SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.global_actions;
- result.add(sir);
-
- return result;
- }
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- ArrayList<String> result = new ArrayList<String>();
- return result;
- }
- };
-}
diff --git a/src/org/omnirom/omnigears/interfacesettings/LockscreenItemSettings.java b/src/org/omnirom/omnigears/interfacesettings/LockscreenItemSettings.java
deleted file mode 100644
index c985ca8..0000000
--- a/src/org/omnirom/omnigears/interfacesettings/LockscreenItemSettings.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2015-2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
-*/
-package org.omnirom.omnigears.interfacesettings;
-import android.os.Bundle;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.support.v7.preference.Preference;
-import android.provider.SearchIndexableResource;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import java.util.List;
-import java.util.ArrayList;
-
-public class LockscreenItemSettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, Indexable {
-
- private static final String TAG = "LockscreenItemSettings";
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.lockscreenitems);
- }
-
- @Override
- public boolean onPreferenceTreeClick(Preference preference) {
- return super.onPreferenceTreeClick(preference);
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- return true;
- }
-
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- ArrayList<SearchIndexableResource> result =
- new ArrayList<SearchIndexableResource>();
-
- SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.lockscreenitems;
- result.add(sir);
-
- return result;
- }
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- ArrayList<String> result = new ArrayList<String>();
- return result;
- }
- };
-}
-
diff --git a/src/org/omnirom/omnigears/interfacesettings/LockscreenSettings.java b/src/org/omnirom/omnigears/interfacesettings/LockscreenSettings.java
deleted file mode 100644
index 34adde2..0000000
--- a/src/org/omnirom/omnigears/interfacesettings/LockscreenSettings.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
-*/
-package org.omnirom.omnigears.interfacesettings;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import java.util.List;
-import java.util.ArrayList;
-
-public class LockscreenSettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, Indexable {
- private static final String TAG = "LockscreenSettings";
- private static final String LOCKSCREEN_CLOCK_STYLE = "lockscreen_clock_style";
- private static final String KEY_OMNI_CLOCK_SETTINGS = "omni_clock_settings";
- private static final String KEY_DIGITAL_CLOCK_SETTINGS = "digital_clock_settings";
-
- private ListPreference mLockscreenClockStyle;
- private Preference mOmniClockSettings;
- private Preference mDigitalClockSettings;
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.lockscreen_settings);
- final ContentResolver resolver = getContentResolver();
-
- mLockscreenClockStyle = (ListPreference) findPreference(LOCKSCREEN_CLOCK_STYLE);
- int clockStyle = Settings.System.getInt(resolver,
- Settings.System.LOCKSCREEN_CLOCK_STYLE, 0);
-
- mLockscreenClockStyle.setValue(Integer.toString(clockStyle));
- mLockscreenClockStyle.setSummary(mLockscreenClockStyle.getEntry());
- mLockscreenClockStyle.setOnPreferenceChangeListener(this);
-
- mOmniClockSettings = findPreference(KEY_OMNI_CLOCK_SETTINGS);
- mOmniClockSettings.setEnabled(clockStyle == 2);
-
- mDigitalClockSettings = findPreference(KEY_DIGITAL_CLOCK_SETTINGS);
- mDigitalClockSettings.setEnabled(clockStyle == 0);
- }
-
- @Override
- public boolean onPreferenceTreeClick(Preference preference) {
- return super.onPreferenceTreeClick(preference);
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (preference == mLockscreenClockStyle) {
- int value = Integer.valueOf((String) newValue);
- int index = mLockscreenClockStyle.findIndexOfValue((String) newValue);
- mLockscreenClockStyle.setSummary(mLockscreenClockStyle.getEntries()[index]);
- Settings.System.putInt(getContentResolver(), Settings.System.LOCKSCREEN_CLOCK_STYLE, value);
- mOmniClockSettings.setEnabled(value == 2);
- mDigitalClockSettings.setEnabled(value == 0);
- return true;
- }
- return false;
- }
-
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- ArrayList<SearchIndexableResource> result =
- new ArrayList<SearchIndexableResource>();
-
- SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.lockscreen_settings;
- result.add(sir);
-
- return result;
- }
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- ArrayList<String> result = new ArrayList<String>();
- return result;
- }
- };
-}
diff --git a/src/org/omnirom/omnigears/interfacesettings/NetworkTraffic.java b/src/org/omnirom/omnigears/interfacesettings/NetworkTraffic.java
deleted file mode 100644
index 8797781..0000000
--- a/src/org/omnirom/omnigears/interfacesettings/NetworkTraffic.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2015 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.omnirom.omnigears.interfacesettings;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.res.Resources;
-import android.net.TrafficStats;
-import android.os.Bundle;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.R;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.omnirom.omnilib.preference.SeekBarPreference;
-
-public class NetworkTraffic extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, Indexable {
- private static final String TAG = "NetworkTraffic";
-
- private static final String NETWORK_TRAFFIC_STATE = "network_traffic_state";
- private static final String NETWORK_TRAFFIC_UNIT = "network_traffic_unit";
- private static final String NETWORK_TRAFFIC_PERIOD = "network_traffic_period";
- private static final String NETWORK_TRAFFIC_AUTOHIDE = "network_traffic_autohide";
- private static final String NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD = "network_traffic_autohide_threshold";
-
- private ListPreference mNetTrafficState;
- private ListPreference mNetTrafficUnit;
- private ListPreference mNetTrafficPeriod;
- private SeekBarPreference mNetTrafficAutohideThreshold;
-
- private int mNetTrafficVal;
- private int MASK_UP;
- private int MASK_DOWN;
- private int MASK_UNIT;
- private int MASK_PERIOD;
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.network_traffic);
- loadResources();
-
- PreferenceScreen prefScreen = getPreferenceScreen();
- ContentResolver resolver = getActivity().getContentResolver();
-
- mNetTrafficState = (ListPreference) prefScreen.findPreference(NETWORK_TRAFFIC_STATE);
- mNetTrafficUnit = (ListPreference) prefScreen.findPreference(NETWORK_TRAFFIC_UNIT);
- mNetTrafficPeriod = (ListPreference) prefScreen.findPreference(NETWORK_TRAFFIC_PERIOD);
- mNetTrafficAutohideThreshold = (SeekBarPreference) prefScreen.findPreference(NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD);
-
- // TrafficStats will return UNSUPPORTED if the device does not support it.
- if (TrafficStats.getTotalTxBytes() != TrafficStats.UNSUPPORTED &&
- TrafficStats.getTotalRxBytes() != TrafficStats.UNSUPPORTED) {
- mNetTrafficVal = Settings.System.getInt(resolver, Settings.System.NETWORK_TRAFFIC_STATE, 0);
- int intIndex = mNetTrafficVal & (MASK_UP + MASK_DOWN);
- intIndex = mNetTrafficState.findIndexOfValue(String.valueOf(intIndex));
-
- mNetTrafficState.setValueIndex(intIndex >= 0 ? intIndex : 0);
- mNetTrafficState.setSummary(mNetTrafficState.getEntry());
- mNetTrafficState.setOnPreferenceChangeListener(this);
-
- mNetTrafficUnit.setValueIndex(getBit(mNetTrafficVal, MASK_UNIT) ? 1 : 0);
- mNetTrafficUnit.setSummary(mNetTrafficUnit.getEntry());
- mNetTrafficUnit.setOnPreferenceChangeListener(this);
-
- int period = (mNetTrafficVal & MASK_PERIOD) >>> 16;
- int periodIndex = mNetTrafficPeriod.findIndexOfValue(String.valueOf(period));
- mNetTrafficPeriod.setValueIndex(periodIndex >= 0 ? periodIndex : 1);
- mNetTrafficPeriod.setSummary(mNetTrafficPeriod.getEntry());
- mNetTrafficPeriod.setOnPreferenceChangeListener(this);
-
- int netTrafficAutohideThreshold = Settings.System.getInt(getContentResolver(),
- Settings.System.NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD, 10);
- mNetTrafficAutohideThreshold.setValue(netTrafficAutohideThreshold / 1);
- mNetTrafficAutohideThreshold.setOnPreferenceChangeListener(this);
- }
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- ContentResolver resolver = getActivity().getContentResolver();
- if (preference == mNetTrafficState) {
- int intState = Integer.valueOf((String)newValue);
- mNetTrafficVal = setBit(mNetTrafficVal, MASK_UP, getBit(intState, MASK_UP));
- mNetTrafficVal = setBit(mNetTrafficVal, MASK_DOWN, getBit(intState, MASK_DOWN));
- Settings.System.putInt(resolver, Settings.System.NETWORK_TRAFFIC_STATE, mNetTrafficVal);
- int index = mNetTrafficState.findIndexOfValue((String) newValue);
- mNetTrafficState.setSummary(mNetTrafficState.getEntries()[index]);
- } else if (preference == mNetTrafficUnit) {
- // 1 = Display as Byte/s; default is bit/s
- mNetTrafficVal = setBit(mNetTrafficVal, MASK_UNIT, ((String)newValue).equals("1"));
- Settings.System.putInt(resolver, Settings.System.NETWORK_TRAFFIC_STATE, mNetTrafficVal);
- int index = mNetTrafficUnit.findIndexOfValue((String) newValue);
- mNetTrafficUnit.setSummary(mNetTrafficUnit.getEntries()[index]);
- } else if (preference == mNetTrafficPeriod) {
- int intState = Integer.valueOf((String)newValue);
- mNetTrafficVal = setBit(mNetTrafficVal, MASK_PERIOD, false) + (intState << 16);
- Settings.System.putInt(resolver, Settings.System.NETWORK_TRAFFIC_STATE, mNetTrafficVal);
- int index = mNetTrafficPeriod.findIndexOfValue((String) newValue);
- mNetTrafficPeriod.setSummary(mNetTrafficPeriod.getEntries()[index]);
- } else if (preference == mNetTrafficAutohideThreshold) {
- int threshold = (Integer) newValue;
- Settings.System.putInt(getActivity().getContentResolver(),
- Settings.System.NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD, threshold * 1);
- }
-
- return true;
- }
-
- private void loadResources() {
- Resources resources = getActivity().getResources();
- MASK_UP = resources.getInteger(R.integer.maskUp);
- MASK_DOWN = resources.getInteger(R.integer.maskDown);
- MASK_UNIT = resources.getInteger(R.integer.maskUnit);
- MASK_PERIOD = resources.getInteger(R.integer.maskPeriod);
- }
-
- // intMask should only have the desired bit(s) set
- private int setBit(int intNumber, int intMask, boolean blnState) {
- if (blnState) {
- return (intNumber | intMask);
- }
- return (intNumber & ~intMask);
- }
-
- private boolean getBit(int intNumber, int intMask) {
- return (intNumber & intMask) == intMask;
- }
-
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- ArrayList<SearchIndexableResource> result =
- new ArrayList<SearchIndexableResource>();
-
- SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.network_traffic;
- result.add(sir);
-
- return result;
- }
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- ArrayList<String> result = new ArrayList<String>();
- return result;
- }
- };
-}
diff --git a/src/org/omnirom/omnigears/interfacesettings/StatusbarBatterySettings.java b/src/org/omnirom/omnigears/interfacesettings/StatusbarBatterySettings.java
deleted file mode 100644
index b7ea971..0000000
--- a/src/org/omnirom/omnigears/interfacesettings/StatusbarBatterySettings.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2015-2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
-*/
-package org.omnirom.omnigears.interfacesettings;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.omnirom.omnilib.preference.ColorSelectPreference;
-import org.omnirom.omnilib.preference.SeekBarPreference;
-import org.omnirom.omnilib.preference.SystemCheckBoxPreference;
-
-public class StatusbarBatterySettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, Indexable {
- private static final String TAG = "StatusbarBatterySettings";
-
- private static final String STATUSBAR_BATTERY_STYLE = "statusbar_battery_style";
- private static final String STATUSBAR_BATTERY_PERCENT = "statusbar_battery_percent_enable";
- private static final String STATUSBAR_CHARGING_COLOR = "statusbar_battery_charging_color";
- private static final String STATUSBAR_BATTERY_PERCENT_INSIDE = "statusbar_battery_percent_inside";
- private static final String STATUSBAR_BATTERY_SHOW_BOLT = "statusbar_battery_charging_image";
-
- private ListPreference mBatteryStyle;
- private ListPreference mBatteryPercent;
- private ColorSelectPreference mChargingColor;
- private Preference mPercentInside;
- private Preference mShowBolt;
- private int mBatteryStyleValue;
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.statusbar_battery_settings);
-
- PreferenceScreen prefScreen = getPreferenceScreen();
- ContentResolver resolver = getActivity().getContentResolver();
-
- mBatteryStyle = (ListPreference) findPreference(STATUSBAR_BATTERY_STYLE);
- mBatteryStyleValue = Settings.System.getInt(resolver,
- Settings.System.STATUSBAR_BATTERY_STYLE, 0);
-
- mBatteryStyle.setValue(Integer.toString(mBatteryStyleValue));
- mBatteryStyle.setSummary(mBatteryStyle.getEntry());
- mBatteryStyle.setOnPreferenceChangeListener(this);
-
- mChargingColor = (ColorSelectPreference) prefScreen.findPreference(STATUSBAR_CHARGING_COLOR);
- int chargingColor = Settings.System.getInt(resolver, Settings.System.STATUSBAR_BATTERY_CHARGING_COLOR, 0xFFFFFFFF);
- mChargingColor.setColor(chargingColor);
- String hexColor = String.format("#%08X", chargingColor);
- mChargingColor.setSummary(hexColor);
- mChargingColor.setOnPreferenceChangeListener(this);
-
- mPercentInside = findPreference(STATUSBAR_BATTERY_PERCENT_INSIDE);
-
- mBatteryPercent = (ListPreference) findPreference(STATUSBAR_BATTERY_PERCENT);
- final int systemShowPercent = Settings.System.getInt(resolver,
- Settings.System.SHOW_BATTERY_PERCENT, 0);
- int showPercent = Settings.System.getInt(resolver,
- Settings.System.STATUSBAR_BATTERY_PERCENT, systemShowPercent);
- int forceShowPercent = Settings.System.getInt(resolver,
- Settings.System.STATUSBAR_BATTERY_FORCE_PERCENT, 0);
- int batteryPercentValue = 0;
- if (showPercent == 1) {
- batteryPercentValue = 1;
- } else if (forceShowPercent == 1) {
- batteryPercentValue = 2;
- }
- mBatteryPercent.setValue(Integer.toString(batteryPercentValue));
- mBatteryPercent.setSummary(mBatteryPercent.getEntry());
- mBatteryPercent.setOnPreferenceChangeListener(this);
-
- mShowBolt = findPreference(STATUSBAR_BATTERY_SHOW_BOLT);
-
- //updateEnablement();
- }
-
- @Override
- public boolean onPreferenceTreeClick(Preference preference) {
- // If we didn't handle it, let preferences handle it.
- return super.onPreferenceTreeClick(preference);
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- ContentResolver resolver = getActivity().getContentResolver();
- if (preference == mBatteryStyle) {
- mBatteryStyleValue = Integer.valueOf((String) newValue);
- int index = mBatteryStyle.findIndexOfValue((String) newValue);
- mBatteryStyle.setSummary(
- mBatteryStyle.getEntries()[index]);
- Settings.System.putInt(getContentResolver(),
- Settings.System.STATUSBAR_BATTERY_STYLE, mBatteryStyleValue);
- } else if (preference == mChargingColor) {
- String hexColor = String.format("#%08X", mChargingColor.getColor());
- mChargingColor.setSummary(hexColor);
- Settings.System.putInt(resolver,
- Settings.System.STATUSBAR_BATTERY_CHARGING_COLOR, mChargingColor.getColor());
- } else if (preference == mBatteryPercent) {
- int batteryPercentValue = Integer.valueOf((String) newValue);
- if (batteryPercentValue == 1) {
- Settings.System.putInt(getContentResolver(),
- Settings.System.STATUSBAR_BATTERY_PERCENT, 1);
- Settings.System.putInt(getContentResolver(),
- Settings.System.STATUSBAR_BATTERY_FORCE_PERCENT, 0);
- } else if (batteryPercentValue == 2) {
- Settings.System.putInt(getContentResolver(),
- Settings.System.STATUSBAR_BATTERY_PERCENT, 0);
- Settings.System.putInt(getContentResolver(),
- Settings.System.STATUSBAR_BATTERY_FORCE_PERCENT, 1);
- } else {
- Settings.System.putInt(getContentResolver(),
- Settings.System.STATUSBAR_BATTERY_PERCENT, 0);
- Settings.System.putInt(getContentResolver(),
- Settings.System.STATUSBAR_BATTERY_FORCE_PERCENT, 0);
- }
- mBatteryPercent.setValue(Integer.toString(batteryPercentValue));
- mBatteryPercent.setSummary(mBatteryPercent.getEntry());
- }
- //updateEnablement();
- return true;
- }
-
- /*private void updateEnablement() {
- mPercentInside.setEnabled(mBatteryStyleValue != 3 && mBatteryStyleValue != 4);
- mShowBolt.setEnabled(mBatteryStyleValue != 3 && mBatteryStyleValue != 4);
- mBatteryPercent.setEnabled(mBatteryStyleValue != 3);
- }*/
-
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- ArrayList<SearchIndexableResource> result =
- new ArrayList<SearchIndexableResource>();
-
- SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.statusbar_battery_settings;
- result.add(sir);
-
- return result;
- }
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- ArrayList<String> result = new ArrayList<String>();
- return result;
- }
- };
-}
diff --git a/src/org/omnirom/omnigears/interfacesettings/StatusbarClockSettings.java b/src/org/omnirom/omnigears/interfacesettings/StatusbarClockSettings.java
deleted file mode 100644
index 981cc4e..0000000
--- a/src/org/omnirom/omnigears/interfacesettings/StatusbarClockSettings.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (C) 2015-2018 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
-*/
-package org.omnirom.omnigears.interfacesettings;
-
-import android.app.AlertDialog;
-
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.preference.EditTextPreference;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v14.preference.SwitchPreference;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-import android.text.format.DateFormat;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.EditText;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Date;
-
-public class StatusbarClockSettings extends SettingsPreferenceFragment implements
- OnPreferenceChangeListener, Indexable {
- private static final String TAG = "StatusbarClockSettings";
-
- private static final String PREF_CLOCK_STYLE = "clock_style";
- private static final String PREF_AM_PM_STYLE = "status_bar_am_pm";
- private static final String PREF_CLOCK_DATE_DISPLAY = "clock_date_display";
- private static final String PREF_CLOCK_DATE_STYLE = "clock_date_style";
- private static final String PREF_CLOCK_DATE_FORMAT = "clock_date_format";
- private static final String PREF_CLOCK_DATE_POSITION = "clock_date_position";
-
- public static final int CLOCK_DATE_STYLE_LOWERCASE = 1;
- public static final int CLOCK_DATE_STYLE_UPPERCASE = 2;
- private static final int CUSTOM_CLOCK_DATE_FORMAT_INDEX = 18;
-
- private ListPreference mClockStyle;
- private ListPreference mClockAmPmStyle;
- private ListPreference mClockDateDisplay;
- private ListPreference mClockDateStyle;
- private ListPreference mClockDateFormat;
- private ListPreference mClockDatePosition;
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.statusbar_clock_settings);
-
- mClockStyle = (ListPreference) findPreference(PREF_CLOCK_STYLE);
- mClockStyle.setOnPreferenceChangeListener(this);
- mClockStyle.setValue(Integer.toString(Settings.System.getInt(getActivity()
- .getContentResolver(), Settings.System.STATUSBAR_CLOCK_STYLE,
- 0)));
- mClockStyle.setSummary(mClockStyle.getEntry());
-
- mClockAmPmStyle = (ListPreference) findPreference(PREF_AM_PM_STYLE);
- mClockAmPmStyle.setOnPreferenceChangeListener(this);
- mClockAmPmStyle.setValue(Integer.toString(Settings.System.getInt(getActivity()
- .getContentResolver(), Settings.System.STATUSBAR_CLOCK_AM_PM_STYLE,
- 0)));
- boolean is24hour = DateFormat.is24HourFormat(getActivity());
- if (is24hour) {
- mClockAmPmStyle.setSummary(R.string.status_bar_am_pm_info);
- } else {
- mClockAmPmStyle.setSummary(mClockAmPmStyle.getEntry());
- }
- mClockAmPmStyle.setEnabled(!is24hour);
-
- mClockDateDisplay = (ListPreference) findPreference(PREF_CLOCK_DATE_DISPLAY);
- mClockDateDisplay.setOnPreferenceChangeListener(this);
- mClockDateDisplay.setValue(Integer.toString(Settings.System.getInt(getActivity()
- .getContentResolver(), Settings.System.STATUSBAR_CLOCK_DATE_DISPLAY,
- 0)));
- mClockDateDisplay.setSummary(mClockDateDisplay.getEntry());
-
- mClockDateStyle = (ListPreference) findPreference(PREF_CLOCK_DATE_STYLE);
- mClockDateStyle.setOnPreferenceChangeListener(this);
- mClockDateStyle.setValue(Integer.toString(Settings.System.getInt(getActivity()
- .getContentResolver(), Settings.System.STATUSBAR_CLOCK_DATE_STYLE,
- 0)));
- mClockDateStyle.setSummary(mClockDateStyle.getEntry());
-
- mClockDatePosition = (ListPreference) findPreference(PREF_CLOCK_DATE_POSITION);
- mClockDatePosition.setOnPreferenceChangeListener(this);
- mClockDatePosition.setValue(Integer.toString(Settings.System.getInt(getActivity()
- .getContentResolver(), Settings.System.STATUSBAR_CLOCK_DATE_POSITION,
- 0)));
- mClockDatePosition.setSummary(mClockDatePosition.getEntry());
-
- mClockDateFormat = (ListPreference) findPreference(PREF_CLOCK_DATE_FORMAT);
- mClockDateFormat.setOnPreferenceChangeListener(this);
- String value = Settings.System.getString(getActivity().getContentResolver(),
- Settings.System.STATUSBAR_CLOCK_DATE_FORMAT);
- if (value == null || value.isEmpty()) {
- value = "EEE";
- }
- int index = mClockDateFormat.findIndexOfValue((String) value);
- if (index == -1) {
- mClockDateFormat.setValueIndex(CUSTOM_CLOCK_DATE_FORMAT_INDEX);
- } else {
- mClockDateFormat.setValue(value);
- }
-
- parseClockDateFormats();
-
- boolean mClockDateToggle = Settings.System.getInt(getActivity().getContentResolver(),
- Settings.System.STATUSBAR_CLOCK_DATE_DISPLAY, 0) != 0;
- if (!mClockDateToggle) {
- mClockDateStyle.setEnabled(false);
- mClockDatePosition.setEnabled(false);
- mClockDateFormat.setEnabled(false);
- }
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- AlertDialog dialog;
-
- if (preference == mClockAmPmStyle) {
- int val = Integer.parseInt((String) newValue);
- int index = mClockAmPmStyle.findIndexOfValue((String) newValue);
- Settings.System.putInt(getActivity().getContentResolver(),
- Settings.System.STATUSBAR_CLOCK_AM_PM_STYLE, val);
- mClockAmPmStyle.setSummary(mClockAmPmStyle.getEntries()[index]);
- return true;
- } else if (preference == mClockStyle) {
- int val = Integer.parseInt((String) newValue);
- int index = mClockStyle.findIndexOfValue((String) newValue);
- Settings.System.putInt(getActivity().getContentResolver(),
- Settings.System.STATUSBAR_CLOCK_STYLE, val);
- mClockStyle.setSummary(mClockStyle.getEntries()[index]);
- return true;
- } else if (preference == mClockDateDisplay) {
- int val = Integer.parseInt((String) newValue);
- int index = mClockDateDisplay.findIndexOfValue((String) newValue);
- Settings.System.putInt(getActivity().getContentResolver(),
- Settings.System.STATUSBAR_CLOCK_DATE_DISPLAY, val);
- mClockDateDisplay.setSummary(mClockDateDisplay.getEntries()[index]);
- if (val == 0) {
- mClockDateStyle.setEnabled(false);
- mClockDatePosition.setEnabled(false);
- mClockDateFormat.setEnabled(false);
- } else {
- mClockDateStyle.setEnabled(true);
- mClockDatePosition.setEnabled(true);
- mClockDateFormat.setEnabled(true);
- }
- return true;
- } else if (preference == mClockDateStyle) {
- int val = Integer.parseInt((String) newValue);
- int index = mClockDateStyle.findIndexOfValue((String) newValue);
- Settings.System.putInt(getActivity().getContentResolver(),
- Settings.System.STATUSBAR_CLOCK_DATE_STYLE, val);
- mClockDateStyle.setSummary(mClockDateStyle.getEntries()[index]);
- parseClockDateFormats();
- return true;
- } else if (preference == mClockDatePosition) {
- int val = Integer.parseInt((String) newValue);
- int index = mClockDatePosition.findIndexOfValue((String) newValue);
- Settings.System.putInt(getActivity().getContentResolver(),
- Settings.System.STATUSBAR_CLOCK_DATE_POSITION, val);
- mClockDatePosition.setSummary(mClockDatePosition.getEntries()[index]);
- parseClockDateFormats();
- return true;
- } else if (preference == mClockDateFormat) {
- int index = mClockDateFormat.findIndexOfValue((String) newValue);
-
- if (index == CUSTOM_CLOCK_DATE_FORMAT_INDEX) {
- AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
- alert.setTitle(R.string.clock_date_string_edittext_title);
- alert.setMessage(R.string.clock_date_string_edittext_summary);
-
- final EditText input = new EditText(getActivity());
- String oldText = Settings.System.getString(
- getActivity().getContentResolver(),
- Settings.System.STATUSBAR_CLOCK_DATE_FORMAT);
- if (oldText != null) {
- input.setText(oldText);
- }
- alert.setView(input);
-
- alert.setPositiveButton(R.string.menu_save, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialogInterface, int whichButton) {
- String value = input.getText().toString();
- if (value.equals("")) {
- return;
- }
- Settings.System.putString(getActivity().getContentResolver(),
- Settings.System.STATUSBAR_CLOCK_DATE_FORMAT, value);
-
- return;
- }
- });
-
- alert.setNegativeButton(R.string.menu_cancel,
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialogInterface, int which) {
- return;
- }
- });
- dialog = alert.create();
- dialog.show();
- } else {
- if ((String) newValue != null) {
- Settings.System.putString(getActivity().getContentResolver(),
- Settings.System.STATUSBAR_CLOCK_DATE_FORMAT, (String) newValue);
- }
- }
- return true;
- }
- return false;
- }
-
- private void parseClockDateFormats() {
- String[] dateEntries = getResources().getStringArray(R.array.clock_date_format_entries_values);
- CharSequence parsedDateEntries[];
- parsedDateEntries = new String[dateEntries.length];
- Date now = new Date();
-
- int lastEntry = dateEntries.length - 1;
- int dateFormat = Settings.System.getInt(getActivity()
- .getContentResolver(), Settings.System.STATUSBAR_CLOCK_DATE_STYLE, 0);
- for (int i = 0; i < dateEntries.length; i++) {
- if (i == lastEntry) {
- parsedDateEntries[i] = dateEntries[i];
- } else {
- String newDate;
- CharSequence dateString = DateFormat.format(dateEntries[i], now);
- if (dateFormat == CLOCK_DATE_STYLE_LOWERCASE) {
- newDate = dateString.toString().toLowerCase();
- } else if (dateFormat == CLOCK_DATE_STYLE_UPPERCASE) {
- newDate = dateString.toString().toUpperCase();
- } else {
- newDate = dateString.toString();
- }
-
- parsedDateEntries[i] = newDate;
- }
- }
- mClockDateFormat.setEntries(parsedDateEntries);
- }
-
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- ArrayList<SearchIndexableResource> result =
- new ArrayList<SearchIndexableResource>();
-
- SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.statusbar_clock_settings;
- result.add(sir);
-
- return result;
- }
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- ArrayList<String> result = new ArrayList<String>();
- return result;
- }
- };
-}
-
diff --git a/src/org/omnirom/omnigears/interfacesettings/StyleSettings.java b/src/org/omnirom/omnigears/interfacesettings/StyleSettings.java
deleted file mode 100644
index 86b1b6d..0000000
--- a/src/org/omnirom/omnigears/interfacesettings/StyleSettings.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright (C) 2017 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
-*/
-package org.omnirom.omnigears.interfacesettings;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import org.omnirom.omnilib.preference.SystemSettingSwitchPreference;
-import org.omnirom.omnilib.preference.SeekBarPreference;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class StyleSettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, Indexable {
- private static final String TAG = "StyleSettings";
- private static final String CUSTOM_WALL_BROWSE = "custom_wall_browse";
- private static final String CUSTOM_HEADER_BROWSE = "custom_header_browse";
- private static final String DAYLIGHT_HEADER_PACK = "daylight_header_pack";
- private static final String CUSTOM_HEADER_IMAGE_SHADOW = "status_bar_custom_header_shadow";
- private static final String CUSTOM_HEADER_PROVIDER = "custom_header_provider";
- private static final String STATUS_BAR_CUSTOM_HEADER = "status_bar_custom_header";
- private static final String SYSTEMUI_THEME_STYLE = "systemui_theme_style";
- private static final String FILE_HEADER_SELECT = "file_header_select";
-
- private static final int REQUEST_PICK_IMAGE = 0;
-
- private Preference mWallBrowse;
- private Preference mHeaderBrowse;
- private ListPreference mDaylightHeaderPack;
- private SeekBarPreference mHeaderShadow;
- private ListPreference mHeaderProvider;
- private String mDaylightHeaderProvider;
- private SystemSettingSwitchPreference mHeaderEnabled;
- private ListPreference mSystemUIThemeStyle;
- private Preference mFileHeader;
- private String mFileHeaderProvider;
-
- @Override
- public void onResume() {
- super.onResume();
- updateEnablement();
- }
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.style_settings);
-
- mDaylightHeaderProvider = getResources().getString(R.string.daylight_header_provider);
- mFileHeaderProvider = getResources().getString(R.string.file_header_provider);
-
- mWallBrowse = findPreference(CUSTOM_WALL_BROWSE);
- mWallBrowse.setEnabled(isBrowseWallsAvailable());
-
- mHeaderBrowse = findPreference(CUSTOM_HEADER_BROWSE);
-
- mHeaderEnabled = (SystemSettingSwitchPreference) findPreference(STATUS_BAR_CUSTOM_HEADER);
- mHeaderEnabled.setOnPreferenceChangeListener(this);
-
- mDaylightHeaderPack = (ListPreference) findPreference(DAYLIGHT_HEADER_PACK);
-
- List<String> entries = new ArrayList<String>();
- List<String> values = new ArrayList<String>();
- getAvailableHeaderPacks(entries, values);
- mDaylightHeaderPack.setEntries(entries.toArray(new String[entries.size()]));
- mDaylightHeaderPack.setEntryValues(values.toArray(new String[values.size()]));
-
- boolean headerEnabled = Settings.System.getInt(getContentResolver(),
- Settings.System.STATUS_BAR_CUSTOM_HEADER, 0) != 0;
- updateHeaderProviderSummary(headerEnabled);
- mDaylightHeaderPack.setOnPreferenceChangeListener(this);
-
- mHeaderShadow = (SeekBarPreference) findPreference(CUSTOM_HEADER_IMAGE_SHADOW);
- final int headerShadow = Settings.System.getInt(getContentResolver(),
- Settings.System.STATUS_BAR_CUSTOM_HEADER_SHADOW, 0);
- mHeaderShadow.setValue((int)(((double) headerShadow / 255) * 100));
- mHeaderShadow.setOnPreferenceChangeListener(this);
-
- mHeaderProvider = (ListPreference) findPreference(CUSTOM_HEADER_PROVIDER);
- mHeaderProvider.setOnPreferenceChangeListener(this);
-
- mSystemUIThemeStyle = (ListPreference) findPreference(SYSTEMUI_THEME_STYLE);
- int systemUIThemeStyle = Settings.System.getInt(getContentResolver(),
- Settings.System.SYSTEM_UI_THEME, 0);
- int valueIndex = mSystemUIThemeStyle.findIndexOfValue(String.valueOf(systemUIThemeStyle));
- mSystemUIThemeStyle.setValueIndex(valueIndex >= 0 ? valueIndex : 0);
- mSystemUIThemeStyle.setSummary(mSystemUIThemeStyle.getEntry());
- mSystemUIThemeStyle.setOnPreferenceChangeListener(this);
-
- mFileHeader = findPreference(FILE_HEADER_SELECT);
- }
-
- private void updateHeaderProviderSummary(boolean headerEnabled) {
- mDaylightHeaderPack.setSummary(getResources().getString(R.string.header_provider_disabled));
- if (headerEnabled) {
- String settingHeaderPackage = Settings.System.getString(getContentResolver(),
- Settings.System.STATUS_BAR_DAYLIGHT_HEADER_PACK);
- if (settingHeaderPackage != null) {
- int valueIndex = mDaylightHeaderPack.findIndexOfValue(settingHeaderPackage);
- mDaylightHeaderPack.setValueIndex(valueIndex >= 0 ? valueIndex : 0);
- mDaylightHeaderPack.setSummary(mDaylightHeaderPack.getEntry());
- }
- }
- }
-
- @Override
- public boolean onPreferenceTreeClick(Preference preference) {
- if (preference == mFileHeader) {
- Intent intent = new Intent(Intent.ACTION_PICK);
- intent.setType("image/*");
- startActivityForResult(intent, REQUEST_PICK_IMAGE);
- return true;
- }
- return super.onPreferenceTreeClick(preference);
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (preference == mDaylightHeaderPack) {
- String value = (String) newValue;
- Settings.System.putString(getContentResolver(),
- Settings.System.STATUS_BAR_DAYLIGHT_HEADER_PACK, value);
- int valueIndex = mDaylightHeaderPack.findIndexOfValue(value);
- mDaylightHeaderPack.setSummary(mDaylightHeaderPack.getEntries()[valueIndex]);
- } else if (preference == mHeaderShadow) {
- Integer headerShadow = (Integer) newValue;
- int realHeaderValue = (int) (((double) headerShadow / 100) * 255);
- Settings.System.putInt(getContentResolver(),
- Settings.System.STATUS_BAR_CUSTOM_HEADER_SHADOW, realHeaderValue);
- } else if (preference == mHeaderProvider) {
- String value = (String) newValue;
- Settings.System.putString(getContentResolver(),
- Settings.System.STATUS_BAR_CUSTOM_HEADER_PROVIDER, value);
- int valueIndex = mHeaderProvider.findIndexOfValue(value);
- mHeaderProvider.setSummary(mHeaderProvider.getEntries()[valueIndex]);
- updateEnablement();
- } else if (preference == mHeaderEnabled) {
- Boolean headerEnabled = (Boolean) newValue;
- updateHeaderProviderSummary(headerEnabled);
- } else if (preference == mSystemUIThemeStyle) {
- String value = (String) newValue;
- Settings.System.putInt(getContentResolver(), Settings.System.SYSTEM_UI_THEME, Integer.valueOf(value));
- int valueIndex = mSystemUIThemeStyle.findIndexOfValue(value);
- mSystemUIThemeStyle.setSummary(mSystemUIThemeStyle.getEntries()[valueIndex]);
- }
- return true;
- }
-
- private boolean isBrowseWallsAvailable() {
- PackageManager pm = getPackageManager();
- Intent browse = new Intent();
- browse.setClassName("org.omnirom.omnistyle", "org.omnirom.omnistyle.BrowseWallsActivity");
- return pm.resolveActivity(browse, 0) != null;
- }
-
- private boolean isBrowseHeaderAvailable() {
- PackageManager pm = getPackageManager();
- Intent browse = new Intent();
- browse.setClassName("org.omnirom.omnistyle", "org.omnirom.omnistyle.PickHeaderActivity");
- return pm.resolveActivity(browse, 0) != null;
- }
-
- private void getAvailableHeaderPacks(List<String> entries, List<String> values) {
- Map<String, String> headerMap = new HashMap<String, String>();
- Intent i = new Intent();
- PackageManager packageManager = getPackageManager();
- i.setAction("org.omnirom.DaylightHeaderPack");
- for (ResolveInfo r : packageManager.queryIntentActivities(i, 0)) {
- String packageName = r.activityInfo.packageName;
- String label = r.activityInfo.loadLabel(getPackageManager()).toString();
- if (label == null) {
- label = r.activityInfo.packageName;
- }
- headerMap.put(label, packageName);
- }
- i.setAction("org.omnirom.DaylightHeaderPack1");
- for (ResolveInfo r : packageManager.queryIntentActivities(i, 0)) {
- String packageName = r.activityInfo.packageName;
- String label = r.activityInfo.loadLabel(getPackageManager()).toString();
- if (r.activityInfo.name.endsWith(".theme")) {
- continue;
- }
- if (label == null) {
- label = packageName;
- }
- headerMap.put(label, packageName + "/" + r.activityInfo.name);
- }
- List<String> labelList = new ArrayList<String>();
- labelList.addAll(headerMap.keySet());
- Collections.sort(labelList);
- for (String label : labelList) {
- entries.add(label);
- values.add(headerMap.get(label));
- }
- }
-
- @Override
- public void onActivityResult(int requestCode, int resultCode, Intent result) {
- if (requestCode == REQUEST_PICK_IMAGE) {
- if (resultCode != Activity.RESULT_OK) {
- return;
- }
- final Uri imageUri = result.getData();
- Settings.System.putString(getContentResolver(), Settings.System.STATUS_BAR_CUSTOM_HEADER_PROVIDER, "file");
- Settings.System.putString(getContentResolver(), Settings.System.STATUS_BAR_FILE_HEADER_IMAGE, imageUri.toString());
- }
- }
-
- private void updateEnablement() {
- String providerName = Settings.System.getString(getContentResolver(),
- Settings.System.STATUS_BAR_CUSTOM_HEADER_PROVIDER);
- if (providerName == null) {
- providerName = mDaylightHeaderProvider;
- }
- if (!providerName.equals(mDaylightHeaderProvider)) {
- providerName = mFileHeaderProvider;
- }
- int valueIndex = mHeaderProvider.findIndexOfValue(providerName);
- mHeaderProvider.setValueIndex(valueIndex >= 0 ? valueIndex : 0);
- mHeaderProvider.setSummary(mHeaderProvider.getEntry());
- mDaylightHeaderPack.setEnabled(providerName.equals(mDaylightHeaderProvider));
- mFileHeader.setEnabled(providerName.equals(mFileHeaderProvider));
- mHeaderBrowse.setEnabled(isBrowseHeaderAvailable() && providerName.equals(mFileHeaderProvider));
- }
-
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- ArrayList<SearchIndexableResource> result =
- new ArrayList<SearchIndexableResource>();
-
- SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.style_settings;
- result.add(sir);
- return result;
- }
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- ArrayList<String> result = new ArrayList<String>();
- return result;
- }
- };
-
-}
diff --git a/src/org/omnirom/omnigears/moresettings/MoreSettings.java b/src/org/omnirom/omnigears/moresettings/MoreSettings.java
index 43b927c..5bcc3f1 100644
--- a/src/org/omnirom/omnigears/moresettings/MoreSettings.java
+++ b/src/org/omnirom/omnigears/moresettings/MoreSettings.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 The OmniROM Project
+ * Copyright (C) 2017-2018 The OmniROM Project
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -49,10 +49,8 @@
private static final String TAG = "MoreSettings";
private static final String KEY_SHOW_DASHBOARD_COLUMNS = "show_dashboard_columns";
private static final String KEY_HIDE_DASHBOARD_SUMMARY = "hide_dashboard_summary";
- private static final String KEY_SCREEN_OFF_ANIMATION = "screen_off_animation";
private SharedPreferences mAppPreferences;
- private ListPreference mScreenOffAnimation;
@Override
public int getMetricsCategory() {
@@ -88,25 +86,10 @@
return true;
}
});
-
- mScreenOffAnimation = (ListPreference) findPreference(KEY_SCREEN_OFF_ANIMATION);
- int screenOffAnimation = Settings.Global.getInt(getContentResolver(),
- Settings.Global.SCREEN_OFF_ANIMATION, 0);
-
- mScreenOffAnimation.setValue(Integer.toString(screenOffAnimation));
- mScreenOffAnimation.setSummary(mScreenOffAnimation.getEntry());
- mScreenOffAnimation.setOnPreferenceChangeListener(this);
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (preference == mScreenOffAnimation) {
- int value = Integer.valueOf((String) newValue);
- int index = mScreenOffAnimation.findIndexOfValue((String) newValue);
- mScreenOffAnimation.setSummary(mScreenOffAnimation.getEntries()[index]);
- Settings.Global.putInt(getContentResolver(), Settings.Global.SCREEN_OFF_ANIMATION, value);
- return true;
- }
return false;
}
diff --git a/src/org/omnirom/omnigears/moresettings/OmniJawsSettings.java b/src/org/omnirom/omnigears/moresettings/OmniJawsSettings.java
deleted file mode 100644
index 8bf3de4..0000000
--- a/src/org/omnirom/omnigears/moresettings/OmniJawsSettings.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2017 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
-*/
-
-package org.omnirom.omnigears.moresettings;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.SearchIndexableResource;
-import android.provider.Settings;
-import android.util.Log;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.util.omni.PackageUtils;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-
-import java.util.List;
-import java.util.ArrayList;
-
-public class OmniJawsSettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, Indexable {
- private static final String TAG = "OmniJawsSettings";
- private static final String CATEGORY_WEATHER = "weather_category";
- private static final String WEATHER_ICON_PACK = "weather_icon_pack";
- private static final String DEFAULT_WEATHER_ICON_PACKAGE = "org.omnirom.omnijaws";
- private static final String DEFAULT_WEATHER_ICON_PREFIX = "outline";
- private static final String WEATHER_SERVICE_PACKAGE = "org.omnirom.omnijaws";
- private static final String CHRONUS_ICON_PACK_INTENT = "com.dvtonder.chronus.ICON_PACK";
-
- private PreferenceCategory mWeatherCategory;
- private ListPreference mWeatherIconPack;
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.omnijaws_settings);
- final PreferenceScreen prefScreen = getPreferenceScreen();
-
- mWeatherCategory = (PreferenceCategory) prefScreen.findPreference(CATEGORY_WEATHER);
- if (mWeatherCategory != null && !isOmniJawsServiceInstalled()) {
- prefScreen.removePreference(mWeatherCategory);
- } else {
- String settingHeaderPackage = Settings.System.getString(getContentResolver(),
- Settings.System.OMNIJAWS_WEATHER_ICON_PACK);
- if (settingHeaderPackage == null) {
- settingHeaderPackage = DEFAULT_WEATHER_ICON_PACKAGE + "." + DEFAULT_WEATHER_ICON_PREFIX;
- }
- mWeatherIconPack = (ListPreference) findPreference(WEATHER_ICON_PACK);
-
- List<String> entries = new ArrayList<String>();
- List<String> values = new ArrayList<String>();
- getAvailableWeatherIconPacks(entries, values);
- mWeatherIconPack.setEntries(entries.toArray(new String[entries.size()]));
- mWeatherIconPack.setEntryValues(values.toArray(new String[values.size()]));
-
- int valueIndex = mWeatherIconPack.findIndexOfValue(settingHeaderPackage);
- if (valueIndex == -1) {
- // no longer found
- settingHeaderPackage = DEFAULT_WEATHER_ICON_PACKAGE + "." + DEFAULT_WEATHER_ICON_PREFIX;
- Settings.System.putString(getContentResolver(),
- Settings.System.OMNIJAWS_WEATHER_ICON_PACK, settingHeaderPackage);
- valueIndex = mWeatherIconPack.findIndexOfValue(settingHeaderPackage);
- }
- mWeatherIconPack.setValueIndex(valueIndex >= 0 ? valueIndex : 0);
- mWeatherIconPack.setSummary(mWeatherIconPack.getEntry());
- mWeatherIconPack.setOnPreferenceChangeListener(this);
- }
- }
-
- public boolean onPreferenceChange(Preference preference, Object objValue) {
- if (preference == mWeatherIconPack) {
- String value = (String) objValue;
- Settings.System.putString(getContentResolver(),
- Settings.System.OMNIJAWS_WEATHER_ICON_PACK, value);
- int valueIndex = mWeatherIconPack.findIndexOfValue(value);
- mWeatherIconPack.setSummary(mWeatherIconPack.getEntries()[valueIndex]);
- }
- return true;
- }
-
- private boolean isOmniJawsServiceInstalled() {
- return PackageUtils.isAvailableApp(WEATHER_SERVICE_PACKAGE, getActivity());
- }
-
- private void getAvailableWeatherIconPacks(List<String> entries, List<String> values) {
- Intent i = new Intent();
- PackageManager packageManager = getPackageManager();
- i.setAction("org.omnirom.WeatherIconPack");
- for (ResolveInfo r : packageManager.queryIntentActivities(i, 0)) {
- String packageName = r.activityInfo.packageName;
- if (packageName.equals(DEFAULT_WEATHER_ICON_PACKAGE)) {
- values.add(0, r.activityInfo.name);
- } else {
- values.add(r.activityInfo.name);
- }
- String label = r.activityInfo.loadLabel(getPackageManager()).toString();
- if (label == null) {
- label = r.activityInfo.packageName;
- }
- if (packageName.equals(DEFAULT_WEATHER_ICON_PACKAGE)) {
- entries.add(0, label);
- } else {
- entries.add(label);
- }
- }
- i = new Intent(Intent.ACTION_MAIN);
- i.addCategory(CHRONUS_ICON_PACK_INTENT);
- for (ResolveInfo r : packageManager.queryIntentActivities(i, 0)) {
- String packageName = r.activityInfo.packageName;
- values.add(packageName + ".weather");
- String label = r.activityInfo.loadLabel(getPackageManager()).toString();
- if (label == null) {
- label = r.activityInfo.packageName;
- }
- entries.add(label);
- }
- }
-
- private boolean isOmniJawsEnabled() {
- final Uri SETTINGS_URI
- = Uri.parse("content://org.omnirom.omnijaws.provider/settings");
-
- final String[] SETTINGS_PROJECTION = new String[] {
- "enabled"
- };
-
- final Cursor c = getContentResolver().query(SETTINGS_URI, SETTINGS_PROJECTION,
- null, null, null);
- if (c != null) {
- int count = c.getCount();
- if (count == 1) {
- c.moveToPosition(0);
- boolean enabled = c.getInt(0) == 1;
- return enabled;
- }
- }
- return true;
- }
-
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- ArrayList<SearchIndexableResource> result =
- new ArrayList<SearchIndexableResource>();
-
- SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.omnijaws_settings;
- result.add(sir);
-
- return result;
- }
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- ArrayList<String> result = new ArrayList<String>();
- return result;
- }
- };
-}
diff --git a/src/org/omnirom/omnigears/system/CPUStateMonitor.java b/src/org/omnirom/omnigears/system/CPUStateMonitor.java
deleted file mode 100644
index d5b3560..0000000
--- a/src/org/omnirom/omnigears/system/CPUStateMonitor.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Performance Control - An Android CPU Control application Copyright (C)
- * Brandon Valosek, 2011 <bvalosek@gmail.com> Copyright (C) Modified by 2012
- * James Roberts
- * Copyright (C) 2017 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.omnirom.omnigears.system;
-
-import android.os.SystemClock;
-import android.util.Log;
-
-import java.io.*;
-import java.util.*;
-
-public class CPUStateMonitor {
- public static final String TIME_IN_STATE_PATH = "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state";
- public static final String PREF_OFFSETS = "pref_offsets";
- public static final String TIME_IN_STATE_OVERALL_PATH = "/sys/devices/system/cpu/cpufreq/overall_stats/overall_time_in_state";
-
- private Map<Integer, ArrayList<CpuState>> mStates;
- private Map<Integer, Map<Integer, Long>> mOffsets;
- private boolean mOverallStats;
- private int mCpuNum;
- private List<Integer> mFrequencies;
- private List<Integer> mShowCpus;
- private boolean mStatsInMsecs;
-
- public CPUStateMonitor(List<Integer> showCpus, boolean statsInMsecs) {
- mStatsInMsecs = statsInMsecs;
- mShowCpus = showCpus;
- mCpuNum = Helpers.getNumOfCpus();
- mFrequencies = new ArrayList<Integer>();
- mStates = new HashMap<Integer, ArrayList<CpuState>>();
- mOffsets = new HashMap<Integer, Map<Integer, Long>>();
- for (int i = 0; i < mCpuNum; i++) {
- ArrayList<CpuState> cpuStates = new ArrayList<CpuState>();
- mStates.put(i, cpuStates);
-
- Map<Integer, Long> cpuOffsets = new HashMap<Integer, Long>();
- mOffsets.put(i, cpuOffsets);
- }
- mOverallStats = Helpers.hasOverallStats();
- }
-
- public boolean hasOverallStats() {
- return mOverallStats;
- }
-
- @SuppressWarnings("serial")
- public class CPUStateMonitorException extends Exception {
- public CPUStateMonitorException(String s) {
- super(s);
- }
- }
-
- // @SuppressLint({"UseValueOf", "UseValueOf"})
- public class CpuState implements Comparable<CpuState> {
- public CpuState(int cpu, int a, long b, boolean msecs) {
- mCpu = cpu;
- freq = a;
- duration = msecs ? b : (b * 10);
- }
-
- public int freq = 0;
- public long duration = 0;
- public int mCpu = 0;
-
- @Override
- public String toString() {
- return mCpu + ":" + freq + ":" + duration;
- }
-
- public int compareTo(CpuState state) {
- Integer a = freq;
- Integer b = state.freq;
- return a.compareTo(b);
- }
-
- public long getDuration() {
- Map<Integer, Long> offsets = getOffsets(mCpu);
- Long offset = offsets.get(freq);
- if (offset != null) {
- return duration - offset;
- }
- return duration;
- }
- }
-
- public List<CpuState> getStates(int cpu) {
- return mStates.get(cpu);
- }
-
- public List<Integer> getFrequencies() {
- return mFrequencies;
- }
-
- public CpuState getFreqState(int cpu, int freq) {
- List<CpuState> cpuStates = mStates.get(cpu);
- for (CpuState state : cpuStates) {
- if (state.freq == freq) {
- return state;
- }
- }
- return null;
- }
-
- public CpuState getDeepSleepState() {
- List<CpuState> cpuStates = mStates.get(0);
- for (CpuState state : cpuStates) {
- if (state.freq == 0) {
- return state;
- }
- }
- return null;
- }
-
- public long getTotalStateTime(int cpu, boolean withOffset) {
- long sum = 0;
- long offset = 0;
-
- List<CpuState> cpuStates = mStates.get(cpu);
- for (CpuState state : cpuStates) {
- if (withOffset) {
- sum += state.getDuration();
- } else {
- sum += state.duration;
- }
- }
- return sum;
- }
-
- public Map<Integer, Long> getOffsets(int cpu) {
- Map<Integer, Long> cpuOffsets = mOffsets.get(cpu);
- return cpuOffsets;
- }
-
- public void setOffsets(int cpu, Map<Integer, Long> offsets) {
- mOffsets.put(cpu, offsets);
- }
-
- public void setOffsets() throws CPUStateMonitorException {
- updateStates();
- for (int i = 0; i < mCpuNum; i++) {
- if (mShowCpus != null) {
- if (!mShowCpus.contains(i)) {
- continue;
- }
- }
- setOffsets(i);
- }
- }
-
- private void setOffsets(int cpu) throws CPUStateMonitorException {
- Map<Integer, Long> cpuOffsets = mOffsets.get(cpu);
- cpuOffsets.clear();
-
- List<CpuState> cpuStates = mStates.get(cpu);
- for (CpuState state : cpuStates) {
- cpuOffsets.put(state.freq, state.duration);
- }
- }
-
- public void removeOffsets() {
- for (int i = 0; i < mCpuNum; i++) {
- removeOffsets(i);
- }
- }
-
- private void removeOffsets(int cpu) {
- Map<Integer, Long> cpuOffsets = mOffsets.get(cpu);
- cpuOffsets.clear();
- }
-
- public void clear() {
- for (int i = 0; i < mCpuNum; i++) {
- List<CpuState> cpuStates = mStates.get(i);
- cpuStates.clear();
- }
- }
-
- public void updateStates() throws CPUStateMonitorException {
- mFrequencies.clear();
- if (mOverallStats) {
- try {
- InputStream is = new FileInputStream(TIME_IN_STATE_OVERALL_PATH);
- InputStreamReader ir = new InputStreamReader(is);
- BufferedReader br = new BufferedReader(ir);
- clear();
- readInOverallStates(br);
- is.close();
- } catch (IOException e) {
- throw new CPUStateMonitorException(
- "Problem opening time-in-states file");
- }
- } else {
- try {
- clear();
- for (int i = 0; i < mCpuNum; i++) {
- if (mShowCpus != null) {
- if (!mShowCpus.contains(i)) {
- continue;
- }
- }
- List<CpuState> cpuStates = mStates.get(i);
- InputStream is = new FileInputStream(getCpuFreqPathFor(i));
- InputStreamReader ir = new InputStreamReader(is);
- BufferedReader br = new BufferedReader(ir);
- readInStates(br, i, cpuStates);
- is.close();
- }
- } catch (IOException e) {
- throw new CPUStateMonitorException(
- "Problem opening time-in-states file");
- }
- }
-
- List<CpuState> cpuStates = mStates.get(0);
- long sleepTime = Math.max((SystemClock.elapsedRealtime() - SystemClock
- .uptimeMillis()), 0);
- cpuStates.add(new CpuState(0, 0, sleepTime, true));
- Collections.sort(mFrequencies);
- }
-
- private void readInStates(BufferedReader br, int cpu,
- List<CpuState> cpuStates) throws CPUStateMonitorException {
- try {
- String line;
- while ((line = br.readLine()) != null) {
- String[] nums = line.split(" ");
- int freq = Integer.parseInt(nums[0]);
- cpuStates.add(new CpuState(cpu, freq, Long
- .parseLong(nums[1]), mStatsInMsecs));
- if (!mFrequencies.contains(freq)) {
- mFrequencies.add(freq);
- }
- }
- Collections.sort(cpuStates);
- } catch (IOException e) {
- throw new CPUStateMonitorException(
- "Problem processing time-in-states file");
- }
- }
-
- private void readInOverallStates(BufferedReader br)
- throws CPUStateMonitorException {
- int cpu = 0;
- List<CpuState> cpuStates = null;
- ;
- int firstFreq = 0;
- try {
- String line;
- while ((line = br.readLine()) != null) {
- String[] nums = line.split(" ");
- int freq = Integer.parseInt(nums[0]);
- if (firstFreq == 0) {
- firstFreq = freq;
- } else if (freq == firstFreq) {
- cpu++;
- if (cpuStates != null) {
- Collections.sort(cpuStates);
- }
- }
- cpuStates = mStates.get(cpu);
- cpuStates.add(new CpuState(cpu, freq, Long.parseLong(nums[1]), mStatsInMsecs));
- if (!mFrequencies.contains(freq)) {
- mFrequencies.add(freq);
- }
- }
- } catch (IOException e) {
- throw new CPUStateMonitorException(
- "Problem processing time-in-states file");
- }
- }
-
- public void dump() {
- Log.d("PC", "states = " + mStates + "\noffsets = " + mOffsets);
- }
-
- private String getCpuFreqPathFor(int cpu) {
- return TIME_IN_STATE_PATH.replace("cpu0", "cpu" + cpu);
- }
-}
diff --git a/src/org/omnirom/omnigears/system/DozeSettings.java b/src/org/omnirom/omnigears/system/DozeSettings.java
deleted file mode 100644
index f79e532..0000000
--- a/src/org/omnirom/omnigears/system/DozeSettings.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Copyright (C) 2017 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
-*/
-package org.omnirom.omnigears.system;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.provider.Settings;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-public class DozeSettings extends SettingsPreferenceFragment {
- private static final String TAG = "DozeSettings";
-
- private static final String SHARED_PREFERENCES_NAME = "doze_settings";
- private static final String KEY_LIGHT_IDLE_FACTOR = "light_idle_factor";
- private static final String KEY_LOCATION_ACCURACY = "location_accuracy";
- private static final String KEY_IDLE_PENDING_FACTOR = "idle_pending_factor";
- private static final String KEY_IDLE_FACTOR = "idle_factor";
- private static final String KEY_SHOW_ADVANCED = "show_advanced";
-
- final long LIGHT_IDLE_AFTER_INACTIVE_TIMEOUT = 5 * 60 * 1000L;
- final long LIGHT_PRE_IDLE_TIMEOUT = 10 * 60 * 1000L;
- final long LIGHT_IDLE_TIMEOUT = 5 * 60 * 1000L;
- final float LIGHT_IDLE_FACTOR = 2f;
- final long LIGHT_MAX_IDLE_TIMEOUT = 15 * 60 * 1000L;
- final long LIGHT_IDLE_MAINTENANCE_MIN_BUDGET = 1 * 60 * 1000L;
- final long LIGHT_IDLE_MAINTENANCE_MAX_BUDGET = 5 * 60 * 1000L;
- final long MIN_LIGHT_MAINTENANCE_TIME = 5 * 1000L;
- final long MIN_DEEP_MAINTENANCE_TIME = 30 * 1000L;
- final long INACTIVE_TIMEOUT = 30 * 60 * 1000L;
- final long SENSING_TIMEOUT = 4 * 60 * 1000L;
- final long LOCATING_TIMEOUT = 30 * 1000L;
- final float LOCATION_ACCURACY = 20;
- final long MOTION_INACTIVE_TIMEOUT = 10 * 60 * 1000L;
- final long IDLE_AFTER_INACTIVE_TIMEOUT = 30 * 60 * 1000L;
- final long IDLE_PENDING_TIMEOUT = 5 * 60 * 1000L;
- final long MAX_IDLE_PENDING_TIMEOUT = 10 * 60 * 1000L;
- final float IDLE_PENDING_FACTOR = 2;
- final long IDLE_TIMEOUT = 60 * 60 * 1000L;
- final long MAX_IDLE_TIMEOUT = 6 * 60 * 60 * 1000L;
- final float IDLE_FACTOR = 2;
- final long MIN_TIME_TO_ALARM = 60 * 60 * 1000L;
- final long MAX_TEMP_APP_WHITELIST_DURATION = 5 * 60 * 1000L;
- final long MMS_TEMP_APP_WHITELIST_DURATION = 60 * 1000L;
- final long SMS_TEMP_APP_WHITELIST_DURATION = 20 * 1000L;
- final long NOTIFICATION_WHITELIST_DURATION = 30 * 1000L;
-
- private int millisecondsInOneSecond = 1000;
- private LinearLayout mContainer;
- private List<String> mIdleConfigKeys = new ArrayList<String>();
- private List<String> mIdleConfigDesc = new ArrayList<String>();
- private List<String> mIdleConfigShort = new ArrayList<String>();
- private List<Object> mIdleConfigValues = new ArrayList<Object>();
- private List<String> mIdleConfigKeysBasic = new ArrayList<String>();
- private List<EditText> mIdleConfigEdit = new ArrayList<EditText>();
- private List<View> mIdleConfigViews = new ArrayList<View>();
-
- private Context mContext;
- private boolean mShowAdvanced;
-
- private SharedPreferences getPrefs() {
- return mContext.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- mContext = getActivity();
- setHasOptionsMenu(true);
- }
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup root,
- Bundle savedInstanceState) {
- super.onCreateView(inflater, root, savedInstanceState);
-
- mShowAdvanced = getPrefs().getBoolean(KEY_SHOW_ADVANCED, false);
- View view = inflater.inflate(R.layout.doze_settings, root, false);
-
- Profiles.initProfiles();
- Profiles.loadUserProfiles(getPrefs());
-
- mIdleConfigKeys.addAll(Arrays.asList(getResources().getStringArray(R.array.idle_config_keys)));
- mIdleConfigDesc.addAll(Arrays.asList(getResources().getStringArray(R.array.idle_config_desc)));
- mIdleConfigShort.addAll(Arrays.asList(getResources().getStringArray(R.array.idle_config_short)));
- mIdleConfigKeysBasic.addAll(Arrays.asList(getResources().getStringArray(R.array.idle_config_keys_basic)));
-
- mIdleConfigValues.add(LIGHT_IDLE_AFTER_INACTIVE_TIMEOUT);
- mIdleConfigValues.add(LIGHT_PRE_IDLE_TIMEOUT);
- mIdleConfigValues.add(LIGHT_IDLE_TIMEOUT);
- mIdleConfigValues.add(LIGHT_IDLE_FACTOR);
- mIdleConfigValues.add(LIGHT_MAX_IDLE_TIMEOUT);
- mIdleConfigValues.add(LIGHT_IDLE_MAINTENANCE_MIN_BUDGET);
- mIdleConfigValues.add(LIGHT_IDLE_MAINTENANCE_MAX_BUDGET);
- mIdleConfigValues.add(MIN_LIGHT_MAINTENANCE_TIME);
- mIdleConfigValues.add(MIN_DEEP_MAINTENANCE_TIME);
- mIdleConfigValues.add(INACTIVE_TIMEOUT);
- mIdleConfigValues.add(SENSING_TIMEOUT);
- mIdleConfigValues.add(LOCATING_TIMEOUT);
- mIdleConfigValues.add(LOCATION_ACCURACY);
- mIdleConfigValues.add(MOTION_INACTIVE_TIMEOUT);
- mIdleConfigValues.add(IDLE_AFTER_INACTIVE_TIMEOUT);
- mIdleConfigValues.add(IDLE_PENDING_TIMEOUT);
- mIdleConfigValues.add(MAX_IDLE_PENDING_TIMEOUT);
- mIdleConfigValues.add(IDLE_PENDING_FACTOR);
- mIdleConfigValues.add(IDLE_TIMEOUT);
- mIdleConfigValues.add(MAX_IDLE_TIMEOUT);
- mIdleConfigValues.add(IDLE_FACTOR);
- mIdleConfigValues.add(MIN_TIME_TO_ALARM);
- mIdleConfigValues.add(MAX_TEMP_APP_WHITELIST_DURATION);
- mIdleConfigValues.add(MMS_TEMP_APP_WHITELIST_DURATION);
- mIdleConfigValues.add(SMS_TEMP_APP_WHITELIST_DURATION);
- mIdleConfigValues.add(NOTIFICATION_WHITELIST_DURATION);
-
- mContainer = (LinearLayout) view.findViewById(R.id.idle_config_container);
- createOptionsList(inflater);
-
- getSettings();
- return view;
- }
-
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- inflater.inflate(R.menu.doze_settings_menu, menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- int id = item.getItemId();
-
- switch (id) {
- case R.id.action_profile:
- displayProfiles();
- break;
- case R.id.action_save:
- save();
- break;
- case R.id.action_save_as_profile:
- saveAsProfile();
- break;
- case R.id.action_restoredefault:
- restoreDefaults();
- break;
- case R.id.action_filter:
- mShowAdvanced = !mShowAdvanced;
- getPrefs().edit().putBoolean(KEY_SHOW_ADVANCED, mShowAdvanced).commit();
- int i = 0;
- for (View idleConfig : mIdleConfigViews) {
- final String configKey = mIdleConfigKeys.get(i);
- if (mShowAdvanced) {
- idleConfig.setVisibility(View.VISIBLE);
- } else {
- idleConfig.setVisibility(!mIdleConfigKeysBasic.contains(configKey) ? View.GONE : View.VISIBLE);
- }
- i++;
- }
- break;
- }
-
- return super.onOptionsItemSelected(item);
- }
-
- private String getMessage(String desc, String value) {
- return desc +
- "\n\n" + getResources().getString(R.string.string_default) +
- ": " +
- value +
- " " +
- getResources().getString(R.string.string_seconds);
- }
-
-
- private void getSettings() {
- String line = Settings.Global.getString(getContentResolver(), Settings.Global.DEVICE_IDLE_CONSTANTS_USER);
-
- KeyValueListParser parser = new KeyValueListParser(',');
- if ("null".equals(line)) {
- parser.setString(line + "=0");
- } else {
- parser.setString(line);
- }
- int divideBy = getDisplayValueFix();
- for (int i = 0; i < mIdleConfigKeys.size(); i++) {
- EditText editText = mIdleConfigEdit.get(i);
- String key = mIdleConfigKeys.get(i);
- Object defaultValue = mIdleConfigValues.get(i);
-
- if (!key.equals(KEY_IDLE_FACTOR) && !key.equals(KEY_IDLE_PENDING_FACTOR) && !key.equals(KEY_IDLE_PENDING_FACTOR) && !key.equals(KEY_LOCATION_ACCURACY) && !key.equals(KEY_LIGHT_IDLE_FACTOR)) {
- Long value = parser.getLong(key, (Long) defaultValue);
- value = value / divideBy;
- editText.setText(String.valueOf(value));
- } else {
- Float value = parser.getFloat(key, (Float) defaultValue);
- editText.setText(String.valueOf(value));
- }
- }
- }
-
-
- private int getDisplayValueFix() {
- return millisecondsInOneSecond;
- }
-
- private void save() {
- int multiplyBy = getDisplayValueFix();
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < mIdleConfigKeys.size(); i++) {
- EditText editText = mIdleConfigEdit.get(i);
- String key = mIdleConfigKeys.get(i);
-
- if (!key.equals(KEY_IDLE_FACTOR) && !key.equals(KEY_IDLE_PENDING_FACTOR) && !key.equals(KEY_IDLE_PENDING_FACTOR) && !key.equals(KEY_LOCATION_ACCURACY) && !key.equals(KEY_LIGHT_IDLE_FACTOR)) {
- Long value = Long.valueOf(editText.getText().toString()) * multiplyBy;
- sb.append(key + "=" + value + ",");
- } else {
- Float value = Float.valueOf(editText.getText().toString());
- sb.append(key + "=" + value + ",");
- }
- }
- if (sb.length() != 0) {
- sb.deleteCharAt(sb.length() - 1);
- }
- Settings.Global.putString(getContentResolver(), Settings.Global.DEVICE_IDLE_CONSTANTS_USER, sb.toString());
- showApplyToast();
- }
-
- private void restoreDefaults() {
- Settings.Global.putString(getContentResolver(), Settings.Global.DEVICE_IDLE_CONSTANTS_USER, null);
- getSettings();
- showApplyToast();
- }
-
- private void applyProfile(String settings) {
- Settings.Global.putString(getContentResolver(), Settings.Global.DEVICE_IDLE_CONSTANTS_USER, settings);
- getSettings();
- showApplyToast();
- }
-
- private void displayProfiles() {
- final ArrayList<Profiles.Profile> combinedProfileList = new ArrayList<>();
- combinedProfileList.addAll(Profiles.getSystemProfileList());
- combinedProfileList.addAll(Profiles.getUserProfileList());
- Collections.sort(combinedProfileList);
- int profileCount = 0;
- String[] names = new String[combinedProfileList.size()];
- for (Profiles.Profile profile : combinedProfileList) {
- if (Profiles.getSystemProfileList().contains(profile)) {
- names[profileCount] = profile.getName() + " *";
- } else {
- names[profileCount] = profile.getName();
- }
- profileCount++;
- }
- AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
- builder.setTitle(getResources().getString(R.string.action_profile));
- builder.setItems(names, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int item) {
- applyProfile(combinedProfileList.get(item).getSettings());
- }
- });
- final AlertDialog alert = builder.create();
- alert.setOnShowListener(new DialogInterface.OnShowListener() {
- @Override
- public void onShow(DialogInterface dialog) {
- ListView lv = alert.getListView();
- lv.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
- @Override
- public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
- Profiles.Profile p = combinedProfileList.get(position);
- if (Profiles.getUserProfileList().contains(p)) {
- AlertDialog.Builder dialog = new AlertDialog.Builder(mContext);
- dialog.setTitle(getResources().getString(R.string.delete_profile));
- dialog.setMessage(p.getName());
- dialog.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- Profiles.removeProfile(p);
- combinedProfileList.remove(p);
- Profiles.saveUserProfiles(getPrefs());
- alert.hide();
- }
- });
- dialog.setNegativeButton(android.R.string.cancel, null);
- dialog.create().show();
- }
- return true;
- }
- });
- }
- });
- alert.show();
- }
-
- private void saveAsProfile() {
- AlertDialog.Builder alert = new AlertDialog.Builder(mContext);
- final EditText edittext = new EditText(mContext);
- alert.setTitle(getResources().getString(R.string.profile_name));
-
- alert.setView(edittext);
-
- alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int whichButton) {
- String name = edittext.getText().toString();
- int multiplyBy = getDisplayValueFix();
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < mIdleConfigKeys.size(); i++) {
- EditText editText = mIdleConfigEdit.get(i);
- String key = mIdleConfigKeys.get(i);
-
- if (!key.equals(KEY_IDLE_FACTOR) && !key.equals(KEY_IDLE_PENDING_FACTOR) && !key.equals(KEY_IDLE_PENDING_FACTOR) && !key.equals(KEY_LOCATION_ACCURACY) && !key.equals(KEY_LIGHT_IDLE_FACTOR)) {
- Long value = Long.valueOf(editText.getText().toString()) * multiplyBy;
- sb.append(key + "=" + value + ",");
- } else {
- Float value = Float.valueOf(editText.getText().toString());
- sb.append(key + "=" + value + ",");
- }
- }
- if (sb.length() != 0) {
- sb.deleteCharAt(sb.length() - 1);
- }
- Profiles.Profile profile = new Profiles.Profile(name, sb.toString());
- Profiles.addProfile(profile);
- Profiles.saveUserProfiles(getPrefs());
- }
- });
-
- alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int whichButton) {
- // what ever you want to do with No option.
- }
- });
-
- alert.show();
- }
-
- private void createOptionsList(LayoutInflater inflater) {
- mContainer.removeAllViews();
- for (int i = 0; i < mIdleConfigKeys.size(); i++) {
- final String configKey = mIdleConfigKeys.get(i);
- final int idx = i;
- View idleConfig = inflater.inflate(R.layout.doze_item, null, false);
- TextView idleConfigText = (TextView) idleConfig.findViewById(R.id.idle_config_text);
- idleConfigText.setText(mIdleConfigShort.get(i));
- EditText idleConfigValue = (EditText) idleConfig.findViewById(R.id.idle_config_edit);
- idleConfigValue.setSaveEnabled(false);
- mIdleConfigEdit.add(idleConfigValue);
- ImageView idleConfigImage = (ImageView) idleConfig.findViewById(R.id.idle_config_image);
- idleConfig.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- String key = mIdleConfigKeys.get(idx);
- int divideBy = getDisplayValueFix();
- AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
- builder.setTitle(key);
- Object value = mIdleConfigValues.get(idx);
- if (!key.equals(KEY_IDLE_FACTOR) && !key.equals(KEY_IDLE_PENDING_FACTOR) && !key.equals(KEY_IDLE_PENDING_FACTOR) && !key.equals(KEY_LOCATION_ACCURACY) && !key.equals(KEY_LIGHT_IDLE_FACTOR)) {
- if (value instanceof Long) {
- value = ((Long) value) / divideBy;
- }
- builder.setMessage(getMessage(mIdleConfigDesc.get(idx), String.valueOf(value)));
- } else {
- builder.setMessage(mIdleConfigDesc.get(idx) +
- "\n\n" +
- getResources().getString(R.string.string_default) +
- ": " +
- String.valueOf(value));
- }
- builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- }
- });
- AlertDialog dialog = builder.create();
- dialog.show();
- }
- });
- mContainer.addView(idleConfig);
- mIdleConfigViews.add(idleConfig);
- if (mShowAdvanced) {
- idleConfig.setVisibility(View.VISIBLE);
- } else {
- idleConfig.setVisibility(!mIdleConfigKeysBasic.contains(configKey) ? View.GONE : View.VISIBLE);
- }
- }
- }
-
- private void showApplyToast() {
- Toast.makeText(mContext, getResources().getString(R.string.doze_settings_applied), Toast.LENGTH_SHORT).show();
- }
-}
diff --git a/src/org/omnirom/omnigears/system/Helpers.java b/src/org/omnirom/omnigears/system/Helpers.java
deleted file mode 100644
index 6f747ad..0000000
--- a/src/org/omnirom/omnigears/system/Helpers.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Performance Control - An Android CPU Control application Copyright (C) 2012
- * Jared Rummler Copyright (C) 2012 James Roberts
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.omnirom.omnigears.system;
-
-import android.app.Activity;
-import android.content.Context;
-import android.util.Log;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class Helpers {
- public static final String TIME_IN_STATE_PATH = "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state";
- public static final String NUM_OF_CPUS_PATH = "/sys/devices/system/cpu/present";
- public static final String TIME_IN_STATE_OVERALL_PATH = "/sys/devices/system/cpu/cpufreq/overall_stats/overall_time_in_state";
-
- /**
- * Read one line from file
- *
- * @param fname
- * @return line
- */
- public static String readOneLine(String fname) {
- String line = null;
- if (new File(fname).exists()) {
- BufferedReader br;
- try {
- br = new BufferedReader(new FileReader(fname), 512);
- try {
- line = br.readLine();
- } finally {
- br.close();
- }
- } catch (Exception e) {
- }
- }
- return line;
- }
-
- /**
- * Get total number of cpus
- *
- * @return total number of cpus
- */
- public static int getNumOfCpus() {
- int numOfCpu = 1;
- String numOfCpus = Helpers.readOneLine(NUM_OF_CPUS_PATH);
- if (numOfCpus == null) {
- return numOfCpu;
- }
- String[] cpuCount = numOfCpus.split("-");
- if (cpuCount.length > 1) {
- try {
- int cpuStart = Integer.parseInt(cpuCount[0]);
- int cpuEnd = Integer.parseInt(cpuCount[1]);
-
- numOfCpu = cpuEnd - cpuStart + 1;
-
- if (numOfCpu < 0)
- numOfCpu = 1;
- } catch (NumberFormatException ex) {
- numOfCpu = 1;
- }
- }
- return numOfCpu;
- }
-
- public static boolean hasOverallStats() {
- return new File(TIME_IN_STATE_OVERALL_PATH).exists();
- }
-}
diff --git a/src/org/omnirom/omnigears/system/KeyValueListParser.java b/src/org/omnirom/omnigears/system/KeyValueListParser.java
deleted file mode 100644
index 3669d78..0000000
--- a/src/org/omnirom/omnigears/system/KeyValueListParser.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.omnirom.omnigears.system;
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import android.text.TextUtils;
-import android.util.ArrayMap;
-
-/**
- * Parses a list of key=value pairs, separated by some delimiter, and puts the results in
- * an internal Map. Values can be then queried by key, or if not found, a default value
- * can be used.
- * @hide
- */
-public class KeyValueListParser {
- private final ArrayMap<String, String> mValues = new ArrayMap<>();
- private final TextUtils.StringSplitter mSplitter;
-
- /**
- * Constructs a new KeyValueListParser. This can be reused for different strings
- * by calling {@link #setString(String)}.
- * @param delim The delimiter that separates key=value pairs.
- */
- public KeyValueListParser(char delim) {
- mSplitter = new TextUtils.SimpleStringSplitter(delim);
- }
-
- /**
- * Resets the parser with a new string to parse. The string is expected to be in the following
- * format:
- * <pre>key1=value,key2=value,key3=value</pre>
- *
- * where the delimiter is a comma.
- *
- * @param str the string to parse.
- * @throws IllegalArgumentException if the string is malformed.
- */
- public void setString(String str) throws IllegalArgumentException {
- mValues.clear();
- if (str != null) {
- mSplitter.setString(str);
- for (String pair : mSplitter) {
- int sep = pair.indexOf('=');
- if (sep < 0) {
- mValues.clear();
- throw new IllegalArgumentException(
- "'" + pair + "' in '" + str + "' is not a valid key-value pair");
- }
- mValues.put(pair.substring(0, sep).trim(), pair.substring(sep + 1).trim());
- }
- }
- }
-
- /**
- * Get the value for key as a long.
- * @param key The key to lookup.
- * @param def The value to return if the key was not found, or the value was not a long.
- * @return the long value associated with the key.
- */
- public long getLong(String key, long def) {
- String value = mValues.get(key);
- if (value != null) {
- try {
- return Long.parseLong(value);
- } catch (NumberFormatException e) {
- // fallthrough
- }
- }
- return def;
- }
-
- /**
- * Get the value for key as a float.
- * @param key The key to lookup.
- * @param def The value to return if the key was not found, or the value was not a float.
- * @return the float value associated with the key.
- */
- public float getFloat(String key, float def) {
- String value = mValues.get(key);
- if (value != null) {
- try {
- return Float.parseFloat(value);
- } catch (NumberFormatException e) {
- // fallthrough
- }
- }
- return def;
- }
-
- /**
- * Get the value for key as a string.
- * @param key The key to lookup.
- * @param def The value to return if the key was not found.
- * @return the string value associated with the key.
- */
- public String getString(String key, String def) {
- String value = mValues.get(key);
- if (value != null) {
- return value;
- }
- return def;
- }
-}
diff --git a/src/org/omnirom/omnigears/system/Profiles.java b/src/org/omnirom/omnigears/system/Profiles.java
deleted file mode 100644
index e2e28a6..0000000
--- a/src/org/omnirom/omnigears/system/Profiles.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2017 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
-*/
-package org.omnirom.omnigears.system;
-
-import android.content.SharedPreferences;
-import android.text.TextUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Profiles {
-
- public static class Profile implements Comparable<Profile> {
-
- private String mName;
- private String mSettings;
-
- public Profile(String name, String settings){
- mName = name;
- mSettings = settings;
- }
-
- public String getName() {
- return mName;
- }
-
- public String getSettings() {
- return mSettings;
- }
-
- @Override
- public boolean equals(Object o) {
- if (o == null || ! (o instanceof Profile)) {
- return false;
- }
- return mName.equals(((Profile)o).getName());
- }
-
- @Override
- public int compareTo(Profile profile) {
- return mName.compareTo(profile.getName());
- }
- }
-
- private static final String PROFILE_PREFS = "profiles";
-
- private static List<Profile> mUserProfileList = new ArrayList<>();
- private static List<Profile> mSysteProfileList = new ArrayList<>();
-
- public static void initProfiles() {
- mSysteProfileList.clear();
- mSysteProfileList.add(new Profile("aggressive", "light_after_inactive_to=30000,light_pre_idle_to=30000,light_idle_to=30000,light_idle_factor=2.0,light_max_idle_to=60000,light_idle_maintenance_min_budget=30000,light_idle_maintenance_max_budget=60000,min_light_maintenance_time=5000,min_deep_maintenance_time=10000,inactive_to=60000,sensing_to=0,locating_to=10000,location_accuracy=20.0,motion_inactive_to=60000,idle_after_inactive_to=0,idle_pending_to=30000,max_idle_pending_to=60000,idle_pending_factor=2.0,idle_to=3600000,max_idle_to=21600000,idle_factor=2.0,min_time_to_alarm=3600000,max_temp_app_whitelist_duration=20000,mms_temp_app_whitelist_duration=20000,sms_temp_app_whitelist_duration=20000,notification_whitelist_duration=20000"));
- }
-
- public static List<Profile> getUserProfileList() {
- return mUserProfileList;
- }
-
- public static List<Profile> getSystemProfileList() {
- return mSysteProfileList;
- }
-
- public static void addProfile(Profile profile) {
- if (mUserProfileList.contains(profile)) {
- mUserProfileList.remove(profile);
- }
- mUserProfileList.add(profile);
- }
-
- public static void removeProfile(Profile profile) {
- mUserProfileList.remove(profile);
- }
-
- public static void loadUserProfiles(SharedPreferences sharedPref) {
- String userProfile = sharedPref.getString(PROFILE_PREFS , null);
- mUserProfileList.clear();
- if (!TextUtils.isEmpty(userProfile)) {
- String[] profiles = userProfile.split(";");
- for (String profile : profiles) {
- String[] profileParts = profile.split(":");
- Profile p = new Profile(profileParts[0], profileParts[1]);
- mUserProfileList.add(p);
- }
- }
- }
-
- public static void saveUserProfiles(SharedPreferences sharedPref){
- if (mUserProfileList.size() != 0) {
- StringBuffer sb = new StringBuffer();
- for (Profile p : mUserProfileList) {
- sb.append(p.getName() + ":" + p.getSettings() + ";");
- }
- sharedPref.edit().putString(PROFILE_PREFS, sb.toString()).commit();
- } else {
- sharedPref.edit().remove(PROFILE_PREFS).commit();
- }
- }
-}
diff --git a/src/org/omnirom/omnigears/system/TimeInState.java b/src/org/omnirom/omnigears/system/TimeInState.java
deleted file mode 100644
index 69008d1..0000000
--- a/src/org/omnirom/omnigears/system/TimeInState.java
+++ /dev/null
@@ -1,523 +0,0 @@
-/*
- * Copyright (C) 2017 The OmniROM Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
-*/
-package org.omnirom.omnigears.system;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.*;
-import android.widget.*;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import org.omnirom.omnigears.system.CPUStateMonitor.CpuState;
-import org.omnirom.omnigears.system.CPUStateMonitor.CPUStateMonitorException;
-
-public class TimeInState extends SettingsPreferenceFragment {
- private static final String TAG = "TimeInState";
- public static final String PREF_OFFSETS = "pref_offsets";
- public static final String PREF_STATE_MODE = "pref_state_mode";
- public static final String PREF_CORE_MODE = "pref_core_mode";
-
- private LinearLayout mStatesView;
- private TextView mTotalStateTime;
- private TextView mStatesWarning;
- private CheckBox mStateMode;
- private boolean mUpdatingData;
- private CPUStateMonitor monitor;
- private Context mContext;
- private int mCpuNum;
- private boolean mActiveStateMode;
- private boolean mActiveCoreMode;
- private Spinner mPeriodTypeSelect;
- private LinearLayout mProgress;
- private CheckBox mCoreMode;
- private int mPeriodType = 1;
- private boolean sHasRefData;
- private Intent mShareIntent;
- private List<Integer> mShowCpus;
- private static boolean sResetStats;
-
- private static final int MENU_REFRESH = Menu.FIRST;
- private static final int MENU_SHARE = MENU_REFRESH + 1;
- private static final String SHARED_PREFERENCES_NAME = "time_in_state";
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- mContext = getActivity();
- boolean statsInMsecs = getResources().getBoolean(R.bool.config_cpufreq_msecs);
-
- mShowCpus = new ArrayList<Integer>();
- String showCpus = getResources().getString(R.string.config_cpufreq_show_cpus);
- if (!TextUtils.isEmpty(showCpus)) {
- String[] parts = showCpus.split(",");
- for (String cpu : parts) {
- mShowCpus.add(Integer.valueOf(cpu));
- }
- }
- monitor = new CPUStateMonitor(mShowCpus, statsInMsecs);
- mActiveCoreMode = mShowCpus.size() > 1;
-
- mCpuNum = Helpers.getNumOfCpus();
- mPeriodType = getPrefs().getInt("which", 1);
- if (savedInstanceState != null) {
- mPeriodType = savedInstanceState.getInt("which");
- }
-
- if (sResetStats) {
- sResetStats = false;
- clearOffsets();
- }
- loadOffsets();
-
- setHasOptionsMenu(true);
- }
-
- private SharedPreferences getPrefs() {
- return mContext.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
- }
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup root,
- Bundle savedInstanceState) {
- super.onCreateView(inflater, root, savedInstanceState);
-
- View view = inflater.inflate(R.layout.time_in_state, root, false);
-
- mStatesView = (LinearLayout) view.findViewById(R.id.ui_states_view);
- mStatesWarning = (TextView) view.findViewById(R.id.ui_states_warning);
- mTotalStateTime = (TextView) view
- .findViewById(R.id.ui_total_state_time);
-
- mStateMode = (CheckBox) view.findViewById(R.id.ui_mode_switch);
- mActiveStateMode = getPrefs().getBoolean(PREF_STATE_MODE, false);
- mStateMode.setChecked(mActiveStateMode);
- mStateMode.setOnCheckedChangeListener(new OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(CompoundButton buttonView,
- boolean isChecked) {
- mActiveStateMode = isChecked;
- SharedPreferences.Editor editor = getPrefs().edit();
- editor.putBoolean(PREF_STATE_MODE, mActiveStateMode).commit();
- updateView();
- }
- });
-
- mCoreMode = (CheckBox) view.findViewById(R.id.ui_core_switch);
- mCoreMode.setVisibility(View.GONE);
-
- mPeriodTypeSelect = (Spinner) view
- .findViewById(R.id.period_type_select);
- ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
- mContext, R.array.period_type_entries, R.layout.spinner_item);
- mPeriodTypeSelect.setAdapter(adapter);
- mPeriodTypeSelect
- .setOnItemSelectedListener(new Spinner.OnItemSelectedListener() {
- @Override
- public void onItemSelected(AdapterView<?> parent,
- View view, int position, long id) {
- mPeriodType = position;
- if (position == 0) {
- loadOffsets();
- } else if (position == 1) {
- monitor.removeOffsets();
- }
- refreshData();
- }
-
- @Override
- public void onNothingSelected(AdapterView<?> arg0) {
- }
- });
- mPeriodTypeSelect.setSelection(mPeriodType);
- mProgress = (LinearLayout) view.findViewById(R.id.ui_progress);
- return view;
- }
-
- @Override
- public void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- outState.putInt("which", mPeriodType);
- }
-
- @Override
- public void onResume() {
- mUpdatingData = false;
- refreshData();
- super.onResume();
- }
-
- @Override
- public void onPause() {
- getPrefs().edit().putInt("which", mPeriodType).commit();
- super.onPause();
- }
-
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- inflater.inflate(R.menu.time_in_state_menu, menu);
-
- menu.add(0, MENU_REFRESH, 0, R.string.mt_refresh)
- .setIcon(R.drawable.ic_menu_refresh_new)
- .setAlphabeticShortcut('r')
- .setShowAsAction(
- MenuItem.SHOW_AS_ACTION_IF_ROOM
- | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-
- menu.add(1, MENU_SHARE, 0, R.string.mt_share)
- .setIcon(R.drawable.ic_menu_share_material)
- .setAlphabeticShortcut('s')
- .setShowAsAction(
- MenuItem.SHOW_AS_ACTION_IF_ROOM
- | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case MENU_REFRESH:
- refreshData();
- break;
- case R.id.reset:
- createResetPoint();
- break;
- case MENU_SHARE:
- if (mShareIntent != null) {
- Intent intent = Intent.createChooser(mShareIntent, null);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- mContext.startActivity(intent);
- }
- break;
- }
- return super.onOptionsItemSelected(item);
- }
-
- private void createResetPoint() {
- try {
- monitor.setOffsets();
- } catch (Exception e) {
- // not good
- }
- saveOffsets();
- if (mPeriodType == 1) {
- monitor.removeOffsets();
- }
- refreshData();
- }
-
- public void updateView() {
- if (mUpdatingData) {
- return;
- }
-
- StringBuffer data = new StringBuffer();
- mStatesView.removeAllViews();
-
- if (monitor.getStates(0).size() == 0) {
- mStatesWarning.setVisibility(View.VISIBLE);
- mTotalStateTime.setText(getResources().getString(R.string.total_time)
- + " " + toString(0));
- mStatesView.setVisibility(View.GONE);
- } else {
- if (mPeriodType == 0 && !sHasRefData) {
- mStatesWarning.setVisibility(View.VISIBLE);
- mStatesWarning.setText(getResources().getString(R.string.no_stat_because_reset_state));
- mTotalStateTime.setText(getResources().getString(R.string.total_time)
- + " " + toString(0));
- mStatesView.setVisibility(View.VISIBLE);
- } else {
- mStatesWarning.setVisibility(View.GONE);
- mStatesView.setVisibility(View.VISIBLE);
- long totTime = getStateTime(mActiveStateMode);
- data.append(totTime + "\n");
- totTime = totTime / 1000;
- if (!mActiveStateMode) {
- CpuState deepSleepState = monitor.getDeepSleepState();
- if (deepSleepState != null) {
- generateStateRowHeader(deepSleepState, mStatesView);
- generateStateRow(deepSleepState, mStatesView);
- data.append(deepSleepState.freq + " "
- + deepSleepState.getDuration() + "\n");
- }
- }
- if (mActiveCoreMode) {
- int cpu = 0;
- for (int freq : monitor.getFrequencies()) {
- boolean headerCreated = false;
- for (cpu = 0; cpu < mCpuNum; cpu++) {
- if (mShowCpus != null) {
- if (!mShowCpus.contains(cpu)) {
- continue;
- }
- }
- CpuState state = monitor.getFreqState(cpu, freq);
- if (state == null) {
- continue;
- }
- if (!headerCreated) {
- generateStateRowHeader(state, mStatesView);
- headerCreated = true;
- }
- generateStateRow(state, mStatesView);
- data.append(state.mCpu + " " + state.freq + " "
- + state.getDuration() + "\n");
- }
- }
- } else {
- for (CpuState state : monitor.getStates(0)) {
- if (state.freq == 0) {
- continue;
- }
- generateStateRowHeader(state, mStatesView);
- generateStateRow(state, mStatesView);
- data.append(state.freq + " " + state.getDuration() + "\n");
- }
- }
-
- mTotalStateTime.setText(getResources().getString(R.string.total_time)
- + " " + toString(totTime));
- }
- }
- updateShareIntent(data.toString());
- }
-
- public void refreshData() {
- if (!mUpdatingData) {
- new RefreshStateDataTask().execute((Void) null);
- }
- }
-
- private static String toString(long tSec) {
- long h = (long) Math.max(0, Math.floor(tSec / (60 * 60)));
- long m = (long) Math.max(0, Math.floor((tSec - h * 60 * 60) / 60));
- long s = Math.max(0, tSec % 60);
- String sDur;
- sDur = h + ":";
- if (m < 10)
- sDur += "0";
- sDur += m + ":";
- if (s < 10)
- sDur += "0";
- sDur += s;
-
- return sDur;
- }
-
- private View generateStateRow(CpuState state, ViewGroup parent) {
- LayoutInflater inflater = LayoutInflater.from(mContext);
- LinearLayout view = (LinearLayout) inflater.inflate(
- R.layout.state_row_line, parent, false);
-
- float per = 0f;
- String sPer = "";
- String sDur = "";
- String sCpu = " ";
- long tSec = 0;
-
- if (state != null) {
- long duration = state.getDuration();
- if (duration != 0) {
- per = (float) duration * 100 / getStateTime(mActiveStateMode);
- if (per > 100f) {
- per = 0f;
- }
- if (per < 0f) {
- per = 0f;
- }
- tSec = duration / 1000;
- }
- sPer = String.format("%3d", (int) per) + "%";
- sDur = toString(tSec);
- if (state.freq != 0 && mActiveCoreMode) {
- sCpu = String.valueOf(state.mCpu);
- }
- }
-
- TextView cpuText = (TextView) view.findViewById(R.id.ui_cpu_text);
- TextView durText = (TextView) view.findViewById(R.id.ui_duration_text);
- TextView perText = (TextView) view
- .findViewById(R.id.ui_percentage_text);
- ProgressBar bar = (ProgressBar) view.findViewById(R.id.ui_bar);
-
- cpuText.setText(sCpu);
- perText.setText(sPer);
- durText.setText(sDur);
- bar.setProgress((int) per);
-
- parent.addView(view);
- return view;
- }
-
- private View generateStateRowHeader(CpuState state, ViewGroup parent) {
- LayoutInflater inflater = LayoutInflater.from(mContext);
- LinearLayout view = (LinearLayout) inflater.inflate(
- R.layout.state_row_header, parent, false);
-
- String sFreq;
- if (state.freq == 0) {
- sFreq = getString(R.string.deep_sleep);
- } else {
- sFreq = state.freq / 1000 + " MHz";
- }
-
- TextView freqText = (TextView) view.findViewById(R.id.ui_freq_text);
- freqText.setText(sFreq);
-
- parent.addView(view);
- return view;
- }
-
- protected class RefreshStateDataTask extends AsyncTask<Void, Void, Void> {
- @Override
- protected Void doInBackground(Void... v) {
- try {
- monitor.updateStates();
- } catch (CPUStateMonitorException e) {
- }
- return null;
- }
-
- @Override
- protected void onPreExecute() {
- mProgress.setVisibility(View.VISIBLE);
- mUpdatingData = true;
- }
-
- @Override
- protected void onPostExecute(Void v) {
- try {
- mProgress.setVisibility(View.GONE);
- mUpdatingData = false;
- updateView();
- } catch(Exception e) {
- }
- }
- }
-
- private void loadOffsets() {
- String prefs = getPrefs().getString(PREF_OFFSETS, "");
- if (TextUtils.isEmpty(prefs)) {
- return;
- }
- String[] cpus = prefs.split(":");
- if (cpus.length != mCpuNum) {
- return;
- }
- try {
- for (int cpu = 0; cpu < mCpuNum; cpu++) {
- if (mShowCpus != null) {
- if (!mShowCpus.contains(cpu)) {
- continue;
- }
- }
- String cpuData = cpus[cpu];
- Map<Integer, Long> offsets = new HashMap<Integer, Long>();
- String[] sOffsets = cpuData.split(",");
- for (String offset : sOffsets) {
- String[] parts = offset.split(";");
- offsets.put(Integer.parseInt(parts[0]),
- Long.parseLong(parts[1]));
- }
- monitor.setOffsets(cpu, offsets);
- }
- } catch (NumberFormatException e) {
- }
- sHasRefData = true;
- }
-
- private void saveOffsets() {
- StringBuffer str = new StringBuffer();
- for (int cpu = 0; cpu < mCpuNum; cpu++) {
- boolean saveCpu = true;
- if (mShowCpus != null) {
- if (!mShowCpus.contains(cpu)) {
- // just placeholder
- str.append("cpu");
- saveCpu = false;
- }
- }
- if (saveCpu) {
- int size = monitor.getOffsets(cpu).entrySet().size();
- int i = 0;
- for (Map.Entry<Integer, Long> entry : monitor.getOffsets(cpu)
- .entrySet()) {
- str.append(entry.getKey() + ";" + entry.getValue());
- if (i < size - 1) {
- str.append(",");
- }
- i++;
- }
- }
- if (cpu < mCpuNum - 1) {
- str.append(":");
- }
- }
- getPrefs().edit().putString(PREF_OFFSETS, str.toString()).commit();
- sHasRefData = true;
- }
-
- private void clearOffsets() {
- getPrefs().edit().putString(PREF_OFFSETS, "").commit();
- sHasRefData = false;
- }
-
- private long getStateTime(boolean activeMode) {
- long total = monitor.getTotalStateTime(0, true);
- if (activeMode) {
- CpuState deepSleepState = monitor.getDeepSleepState();
- if (deepSleepState != null) {
- return total - deepSleepState.getDuration();
- }
- }
- return total;
- }
-
- private void updateShareIntent(String data) {
- mShareIntent = new Intent();
- mShareIntent.setAction(Intent.ACTION_SEND);
- mShareIntent.setType("text/plain");
- mShareIntent.putExtra(Intent.EXTRA_TEXT, data);
- }
-
- public static void triggerResetStats() {
- // on reboot
- sResetStats = true;
- }
-}
diff --git a/src/org/omnirom/omnigears/system/VolumeSteps.java b/src/org/omnirom/omnigears/system/VolumeSteps.java
deleted file mode 100644
index 7042354..0000000
--- a/src/org/omnirom/omnigears/system/VolumeSteps.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2015 The Dirty Unicorns Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.omnirom.omnigears.system;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.media.AudioManager;
-import android.os.Bundle;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.util.omni.DeviceUtils;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-public class VolumeSteps extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener {
- private static final String TAG = "VolumeSteps";
-
- // base map of all preference keys and the associated stream
- private static final Map<String, Integer> volume_map = new HashMap<String, Integer>();
- static {
- volume_map.put("volume_steps_alarm", new Integer(AudioManager.STREAM_ALARM));
- volume_map.put("volume_steps_music", new Integer(AudioManager.STREAM_MUSIC));
- volume_map.put("volume_steps_notification", new Integer(AudioManager.STREAM_NOTIFICATION));
- volume_map.put("volume_steps_ring", new Integer(AudioManager.STREAM_RING));
- volume_map.put("volume_steps_system", new Integer(AudioManager.STREAM_SYSTEM));
- volume_map.put("volume_steps_voice_call", new Integer(AudioManager.STREAM_VOICE_CALL));
- }
-
- // entries to remove on non-telephony devices
- private static final Set<String> telephony_set = new HashSet<String>();
- static {
- telephony_set.add("volume_steps_ring");
- telephony_set.add("volume_steps_voice_call");
- }
-
- // set of available pref keys after device configuration filter
- private Set<String> mAvailableKeys = new HashSet<String>();
- private AudioManager mAudioManager;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.volume_steps);
- mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-
- final PreferenceScreen prefScreen = getPreferenceScreen();
- mAvailableKeys = volume_map.keySet();
-
- // remove invalid audio stream prefs
- boolean isPhone = DeviceUtils.isPhone(getActivity());
-
- if (!isPhone) {
- // remove telephony keys from available set
- mAvailableKeys.removeAll(telephony_set);
- for (String key : telephony_set) {
- Preference toRemove = prefScreen.findPreference(key);
- if (toRemove != null) {
- prefScreen.removePreference(toRemove);
- }
- }
- }
-
- // initialize prefs: set defaults if first run, set listeners and update values
- for (String key : mAvailableKeys) {
- Preference pref = prefScreen.findPreference(key);
- if (pref == null || !(pref instanceof ListPreference)) {
- continue;
- }
- final ListPreference listPref = (ListPreference) pref;
- int steps = mAudioManager.getStreamMaxVolume(volume_map.get(key));
- updateVolumeStepPrefs(listPref, steps);
- listPref.setOnPreferenceChangeListener(this);
- }
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object objValue) {
- if (preference.hasKey() && mAvailableKeys.contains(preference.getKey())) {
- commitVolumeSteps(preference, Integer.parseInt(objValue.toString()));
- }
- return true;
- }
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.OMNI_SETTINGS;
- }
-
- private int getDefaultSteps(Preference pref) {
- if (pref == null || !(pref instanceof ListPreference)) {
- // unlikely
- return -1;
- }
- String key = pref.getKey();
- return mAudioManager.getDefaultStreamMaxVolume(volume_map.get(key));
- }
-
-
- private void updateVolumeStepPrefs(Preference pref, int steps) {
- if (pref == null || !(pref instanceof ListPreference)) {
- return;
- }
- final ListPreference listPref = (ListPreference) pref;
- listPref.setValue(String.valueOf(steps));
- listPref.setSummary(listPref.getEntry());
- }
-
- private void commitVolumeSteps(Preference pref, int steps) {
- Settings.Global.putInt(getContentResolver(), pref.getKey(), steps);
- mAudioManager.setStreamMaxVolume(volume_map.get(pref.getKey()), steps);
- updateVolumeStepPrefs(pref, steps);
- }
-}