Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev

am: 7fbfda67da

Change-Id: Idac94b7754631c7bb0c0f91e8aa17b9d300b6c30
This commit is contained in:
Fan Zhang
2017-08-01 19:24:23 +00:00
committed by android-build-merger
3 changed files with 28 additions and 10 deletions

View File

@@ -15,10 +15,11 @@
limitations under the License.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/assist_gesture_title">
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:key="gesture_assist_settings_page"
android:title="@string/assist_gesture_title">
<com.android.settings.widget.VideoPreference
android:key="gesture_assist_video"
@@ -28,6 +29,6 @@
<SwitchPreference
android:key="gesture_assist"
android:title="@string/assist_gesture_title"
app:keywords="@string/keywords_assist_gesture_launch"/>
app:keywords="@string/keywords_assist_gesture_launch" />
</PreferenceScreen>