Move Gesture settings up one level.
Move System->Languages, input & gestures->Gestures to System->Gestures.
Change-Id: Ie81876208383f69ebf1a0465d76c760d7dd9d95d
Fix: 62276882
Test: make RunSettingsRoboTests
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
new file mode 100644
index 0000000..7f8df1b
--- /dev/null
+++ b/res/xml/gestures.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2017 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/gesture_preference_title" >
+
+ <Preference
+ android:key="gesture_assist_input_summary"
+ android:title="@string/assist_gesture_title"
+ android:fragment="com.android.settings.gestures.AssistGestureSettings" />
+
+ <Preference
+ android:key="gesture_swipe_down_fingerprint_input_summary"
+ android:title="@string/fingerprint_swipe_for_notifications_title"
+ android:fragment="com.android.settings.gestures.SwipeToNotificationSettings" />
+
+ <Preference
+ android:key="gesture_double_tap_power_input_summary"
+ android:title="@string/double_tap_power_for_camera_title"
+ android:fragment="com.android.settings.gestures.DoubleTapPowerSettings" />
+
+ <Preference
+ android:key="gesture_double_twist_input_summary"
+ android:title="@string/double_twist_for_camera_mode_title"
+ android:fragment="com.android.settings.gestures.DoubleTwistGestureSettings" />
+
+ <Preference
+ android:key="gesture_double_tap_screen_input_summary"
+ android:title="@string/ambient_display_title"
+ android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />
+
+ <Preference
+ android:key="gesture_pick_up_input_summary"
+ android:title="@string/ambient_display_pickup_title"
+ android:fragment="com.android.settings.gestures.PickupGestureSettings" />
+
+</PreferenceScreen>
diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml
index 2996c78..95628ef 100644
--- a/res/xml/language_and_input.xml
+++ b/res/xml/language_and_input.xml
@@ -18,7 +18,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
- android:title="@string/language_input_gesture_title" >
+ android:title="@string/language_settings" >
<Preference
android:key="phone_language"
@@ -62,43 +62,6 @@
android:title="@string/user_dict_settings_title"/>
</PreferenceCategory>
- <PreferenceCategory
- android:key="gesture_settings_category"
- android:title="@string/gesture_preference_title"
- settings:keywords="@string/keywords_gesture">
-
- <Preference
- android:key="gesture_assist_input_summary"
- android:title="@string/assist_gesture_title"
- android:fragment="com.android.settings.gestures.AssistGestureSettings" />
-
- <Preference
- android:key="gesture_swipe_down_fingerprint_input_summary"
- android:title="@string/fingerprint_swipe_for_notifications_title"
- android:fragment="com.android.settings.gestures.SwipeToNotificationSettings" />
-
- <Preference
- android:key="gesture_double_tap_screen_input_summary"
- android:title="@string/ambient_display_title"
- android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />
-
- <Preference
- android:key="gesture_pick_up_input_summary"
- android:title="@string/ambient_display_pickup_title"
- android:fragment="com.android.settings.gestures.PickupGestureSettings" />
-
- <Preference
- android:key="gesture_double_tap_power_input_summary"
- android:title="@string/double_tap_power_for_camera_title"
- android:fragment="com.android.settings.gestures.DoubleTapPowerSettings" />
-
- <Preference
- android:key="gesture_double_twist_input_summary"
- android:title="@string/double_twist_for_camera_mode_title"
- android:fragment="com.android.settings.gestures.DoubleTwistGestureSettings" />
-
- </PreferenceCategory>
-
<PreferenceCategory>
<com.android.settings.PointerSpeedPreference
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index b50d2fd..4398971 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -18,6 +18,13 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/header_category_system">
+ <Preference
+ android:key="gesture_settings"
+ android:title="@string/gesture_preference_title"
+ android:icon="@drawable/ic_settings_gestures"
+ android:order="-250"
+ android:fragment="com.android.settings.gestures.GestureSettings" />
+
<!-- Backup -->
<Preference
android:key="backup_settings"