OmniGears: navbar enabler
-move recents style to buttons for now
Change-Id: I91f2f635caab13cc6f8af9694b363cb75b492235
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 36696ca..046cc50 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -180,9 +180,9 @@
<string name="navbar_title">Navigation bar</string>
<string name="navbar_recents_style_title">Recents style</string>
<string name="omniswitch_settings">Settings</string>
- <string name="omniswitch_dialog_running">OmniSwitch is not running. Please make sure to enable it before enabling it as recents.</string>
+ <string name="omniswitch_dialog_running">OmniSwitch is currently not enabled. Please enable it and tick the \u2019Start on boot\u2019 option in the settings.</string>
<string name="omniswitch_dialog_unavail">OmniSwitch is not installed.</string>
- <string name="omniswitch_title">OmniSwitch</string>
+ <string name="omniswitch_title">Recents style</string>
<string name="doze_brightness_level_title">Brightness level</string>
diff --git a/res/xml/bars_settings.xml b/res/xml/bars_settings.xml
index 3ba59b0..36d8153 100644
--- a/res/xml/bars_settings.xml
+++ b/res/xml/bars_settings.xml
@@ -96,7 +96,7 @@
android:defaultValue="false"/>
</PreferenceCategory>
- <PreferenceCategory
+ <!--<PreferenceCategory
android:key="navbar_category"
android:title="@string/navbar_title" >
@@ -106,6 +106,6 @@
android:entries="@array/navbar_recents_style_entries"
android:entryValues="@array/navbar_recents_style_values"
android:persistent="false"/>
- </PreferenceCategory>
+ </PreferenceCategory>-->
</PreferenceScreen>
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 834dc1d..1d9b03b 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -75,7 +75,7 @@
android:key="button_keys"
android:title="@string/button_keys_title" >
- <!--<SwitchPreference
+ <SwitchPreference
android:key="navigation_bar_show"
android:title="@string/navigation_bar_show_title"
android:summary="@string/navigation_bar_show_summary"
@@ -87,7 +87,7 @@
android:summary="@string/hardware_keys_disable_summary"
android:persistent="false"/>
- <CheckBoxPreference
+ <!--<CheckBoxPreference
android:key="virtual_key_haptic_feedback"
android:title="@string/virtual_key_haptic_feedback_title"
android:summary="@string/virtual_key_haptic_feedback_summary"
@@ -109,6 +109,14 @@
android:key="keys_enable_custom"
android:title="@string/keys_enable_custom_title"
android:persistent="false" />-->
+
+ <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>
<PreferenceCategory