diff options
author | crizmess <jens.doll@gmail.com> | 2013-03-18 20:40:21 +0100 |
---|---|---|
committer | DvTonder <david.vantonder@gmail.com> | 2013-03-25 18:08:15 -0400 |
commit | e5bba18990fb2cbb4e777e6bd81a97254d909462 (patch) | |
tree | d7c296ee82aa03d406fb67f443975a5bec6e43b3 /res/xml | |
parent | 5814f08554e053081e76e7dcf6e8ff804ae5d713 (diff) | |
download | packages_apps_Settings-e5bba18990fb2cbb4e777e6bd81a97254d909462.tar.gz packages_apps_Settings-e5bba18990fb2cbb4e777e6bd81a97254d909462.tar.bz2 packages_apps_Settings-e5bba18990fb2cbb4e777e6bd81a97254d909462.zip |
Bringing basic Pie controls to CyanogenMod. (2/2)
This is the settings part of the pie commit, for the real implementation
look in frameworks/base.
Patch Set 3:
* CyanogenMod Code Style
Patch Set 4:
* Strings cleanup
* Better integration into CyanogenMod system settings UX
* Some related cleanup in SysteSettings.java
Patch Set 5 and 6:
* Rename feature to Quick controls to match AOSP terminology
Patch Set 7:
* Remove WIP
Patch Set 8:
* Revert name to Pie controls
Patch Set 11:
* Fix broken revert
* Fix spelling of search
Change-Id: I47599316273d8e46017f49ba62a02cc55a785678
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/pie_control.xml | 60 | ||||
-rw-r--r-- | res/xml/system_settings.xml | 5 |
2 files changed, 65 insertions, 0 deletions
diff --git a/res/xml/pie_control.xml b/res/xml/pie_control.xml new file mode 100644 index 000000000..5b3cab7de --- /dev/null +++ b/res/xml/pie_control.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 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" + android:title="@string/pie_control_title" + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> + + <CheckBoxPreference + android:key="pie_control_checkbox" + android:title="@string/pie_control_title" + android:defaultValue="false" /> + + <CheckBoxPreference + android:key="pie_control_search" + android:title="@string/pie_control_search_title" + android:defaultValue="false" /> + + <com.android.settings.cyanogenmod.PieSizePreference + android:key="pie_control_size" + android:title="@string/pie_control_size" + android:dialogTitle="@string/pie_control_size" /> + + <PreferenceCategory + android:title="@string/pie_control_trigger_positions"> + + <CheckBoxPreference + android:key="pie_control_trigger_left" + android:title="@string/pie_control_trigger_left" + android:defaultValue="false" /> + + <CheckBoxPreference + android:key="pie_control_trigger_bottom" + android:title="@string/pie_control_trigger_bottom" + android:defaultValue="false" /> + + <CheckBoxPreference + android:key="pie_control_trigger_right" + android:title="@string/pie_control_trigger_right" + android:defaultValue="false" /> + + <CheckBoxPreference + android:key="pie_control_trigger_top" + android:title="@string/pie_control_trigger_top" + android:summary="@string/pie_control_trigger_top_summary" + android:defaultValue="false" /> + </PreferenceCategory> +</PreferenceScreen> diff --git a/res/xml/system_settings.xml b/res/xml/system_settings.xml index 200976754..a95446fd8 100644 --- a/res/xml/system_settings.xml +++ b/res/xml/system_settings.xml @@ -64,6 +64,11 @@ android:fragment="com.android.settings.cyanogenmod.HardwareKeys" android:title="@string/hardware_keys_title" /> + <PreferenceScreen + android:key="pie_control" + android:fragment="com.android.settings.cyanogenmod.PieControl" + android:title="@string/pie_control_title" /> + <PreferenceCategory android:key="navigation_bar_category" android:title="@string/navigation_bar_category" > |