[3/3] OmniGears: move UI Tuner to dev settings
-add direct link to quick settings
-add direct link to icons blacklist
-split network traffic into separate fragment
Change-Id: Ib7876603e25bd1582c94a50ca70eb3bff80f31d2
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 046cc50..7ffeff3 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -223,4 +223,8 @@
<string name="status_bar_network_activity_title">Activity indicators</string>
<string name="status_bar_network_activity_summary">Show indicators in signal bars</string>
+ <string name="quick_settings_title">Quick Settings</string>
+ <string name="quick_settings_summary">Configure quick settings tiles</string>
+ <string name="status_bar_icon_blacklist_title">Status bar icons</string>
+ <string name="status_bar_icon_blacklist_summary">Configure what icons are shown on status bar</string>
</resources>
diff --git a/res/xml/bars_settings.xml b/res/xml/bars_settings.xml
index 36d8153..663ea0e 100644
--- a/res/xml/bars_settings.xml
+++ b/res/xml/bars_settings.xml
@@ -33,57 +33,20 @@
android:title="@string/battery_title"
android:fragment="org.omnirom.omnigears.interfacesettings.StatusbarBatterySettings" />-->
+ <PreferenceScreen
+ android:title="@string/status_bar_icon_blacklist_title"
+ android:summary="@string/status_bar_icon_blacklist_summary" >
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.systemui"
+ android:targetClass="com.android.systemui.tuner.StatusBarActivity" />
+ </PreferenceScreen>
</PreferenceCategory>
<!-- Network traffic meter -->
- <PreferenceCategory
+ <PreferenceScreen
android:key="category_network_traffic"
- android:title="@string/network_traffic_title">
-
- <!--<com.android.settings.preference.SystemCheckBoxPreference
- android:key="status_bar_network_activity"
- android:title="@string/status_bar_network_activity_title"
- android:summary="@string/status_bar_network_activity_summary"
- 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" />
-
- <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" />
-
- <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" />
-
- <com.android.settings.preference.SystemCheckBoxPreference
- android:key="network_traffic_autohide"
- android:title="@string/network_traffic_autohide_title"
- android:summary="@string/network_traffic_autohide_summary"
- android:defaultValue="false"/>
-
- <com.android.settings.preference.SeekBarPreference
- android:key="network_traffic_autohide_threshold"
- android:title="@string/network_traffic_autohide_threshold"
- android:max="100"
- settings:min="0"
- settings:unitsLeft=""
- settings:unitsRight="kB/s"
- android:dependency="network_traffic_autohide"
- android:persistent="false" />
-
- </PreferenceCategory>
+ android:title="@string/network_traffic_title"
+ android:fragment="org.omnirom.omnigears.interfacesettings.NetworkTraffic" />
<PreferenceCategory
android:key="notification_category"
@@ -94,18 +57,13 @@
android:title="@string/status_bar_custom_header_title"
android:summary="@string/status_bar_custom_header_summary"
android:defaultValue="false"/>
+
+ <PreferenceScreen
+ android:title="@string/quick_settings_title"
+ android:summary="@string/quick_settings_summary" >
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.systemui"
+ android:targetClass="com.android.systemui.tuner.QsTunerActivity" />
+ </PreferenceScreen>
</PreferenceCategory>
-
- <!--<PreferenceCategory
- android:key="navbar_category"
- android:title="@string/navbar_title" >
-
- <ListPreference
- android:key="navbar_recents_style"
- android:title="@string/navbar_recents_style_title"
- android:entries="@array/navbar_recents_style_entries"
- android:entryValues="@array/navbar_recents_style_values"
- android:persistent="false"/>
- </PreferenceCategory>-->
-
</PreferenceScreen>
diff --git a/res/xml/network_traffic.xml b/res/xml/network_traffic.xml
new file mode 100644
index 0000000..c0d9cee
--- /dev/null
+++ b/res/xml/network_traffic.xml
@@ -0,0 +1,60 @@
+<?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/com.android.settings"
+ android:key="category_network_traffic"
+ android:title="@string/network_traffic_title">
+
+ <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" />
+
+ <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" />
+
+ <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" />
+
+ <com.android.settings.preference.SystemCheckBoxPreference
+ android:key="network_traffic_autohide"
+ android:title="@string/network_traffic_autohide_title"
+ android:summary="@string/network_traffic_autohide_summary"
+ android:defaultValue="false"/>
+
+ <com.android.settings.preference.SeekBarPreference
+ android:key="network_traffic_autohide_threshold"
+ android:title="@string/network_traffic_autohide_threshold"
+ android:max="100"
+ settings:min="0"
+ settings:unitsLeft=""
+ settings:unitsRight="kB/s"
+ android:dependency="network_traffic_autohide"
+ android:persistent="false" />
+
+</PreferenceScreen>