diff options
| author | Jens Doll <jens.doll@gmail.com> | 2013-03-31 17:07:51 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-04-02 00:54:37 -0700 |
| commit | 2433cb7f952f2f1c9e80932e760f8617a1d7d95e (patch) | |
| tree | 8ab0998396727bae3de5566bba974605cd5bce28 /res | |
| parent | 84e35b60634ce02d5dabc6ae135500197c3be871 (diff) | |
| download | packages_apps_Settings-2433cb7f952f2f1c9e80932e760f8617a1d7d95e.zip packages_apps_Settings-2433cb7f952f2f1c9e80932e760f8617a1d7d95e.tar.gz packages_apps_Settings-2433cb7f952f2f1c9e80932e760f8617a1d7d95e.tar.bz2 | |
Merge Navigation Bar and Pie Controls button config (2/2)
Based on the commit series for pie controls, this commit
makes the Navigation Bar and Pie Controls share the same
button layout.
This commit applies the changes made in part 1 to the
Settings app. For the real commit see framework/base.
This commit introduces here:
* Some setting constants changes to avoid clashes with PA.
* Removal of the pie search key setting.
Change-Id: I5b4abd6d32a3fc835466ac4cb1f0b9c851641061
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | res/xml/pie_control.xml | 5 | ||||
| -rw-r--r-- | res/xml/system_settings.xml | 11 |
3 files changed, 6 insertions, 11 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 171d2af..5806354 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5182,7 +5182,6 @@ <string name="pie_control_title">Pie controls</string> <string name="pie_control_enabled">Enabled when Expanded desktop is active</string> <string name="pie_control_disabled">Disabled</string> - <string name="pie_control_search_title">Show search button</string> <string name="pie_control_size">Navigation key size</string> <string name="pie_control_trigger_positions">Trigger positions</string> <string name="pie_control_trigger_left">Left screen border</string> diff --git a/res/xml/pie_control.xml b/res/xml/pie_control.xml index 5b3cab7..ce8a40a 100644 --- a/res/xml/pie_control.xml +++ b/res/xml/pie_control.xml @@ -23,11 +23,6 @@ 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" diff --git a/res/xml/system_settings.xml b/res/xml/system_settings.xml index a95446f..feebf21 100644 --- a/res/xml/system_settings.xml +++ b/res/xml/system_settings.xml @@ -64,11 +64,6 @@ 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" > @@ -82,6 +77,12 @@ android:key="navigation_ring" android:fragment="com.android.settings.cyanogenmod.NavRing" android:title="@string/navigation_ring_title" /> + + <PreferenceScreen + android:key="pie_control" + android:fragment="com.android.settings.cyanogenmod.PieControl" + android:title="@string/pie_control_title" /> + </PreferenceCategory> </PreferenceScreen> |