Merge "Add related assist-gesture keywords"

This commit is contained in:
TreeHugger Robot
2017-05-31 14:55:30 +00:00
committed by Android (Google) Code Review
2 changed files with 5 additions and 2 deletions

View File

@@ -6393,10 +6393,12 @@
<string name="keywords_lockscreen">slide to unlock, password, pattern, PIN</string>
<string name="keywords_profile_challenge">work challenge, work, profile</string>
<string name="keywords_unification">work profile, managed profile, unify, unification, work, profile</string>
<!-- Search keyword for gesture settings -->
<string name="keywords_gesture">gesture</string>
<string name="keywords_payment_settings">pay, tap, payments</string>
<string name="keywords_backup">backup, back up</string>
<string name="keywords_squeeze_to_launch_gesture">gesture, edge, side, active edge, squeeze, grip, assist, assistant, squeezy, squeezie, squeezey, squeezee, ok google, google assistant</string>
<string name="keywords_wake_squeeze_gesture">gesture, wake, notifications, screen, display, screen off, screen on, squeeze, edge, asleep, sleep, grip</string>
<string name="keywords_alarm_silence_gesture">gesture, silence, snooze, alarm, incoming call, quiet, display, lockscreen, squeeze, grip, edge, stop</string>
<!-- NFC Wi-Fi pairing/setup strings-->

View File

@@ -17,6 +17,7 @@
<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">
<com.android.settings.widget.VideoPreference
@@ -28,7 +29,7 @@
android:key="gesture_assist"
android:title="@string/assist_gesture_title"
android:summary="@string/assist_gesture_summary"
app:keywords="@string/keywords_gesture"/>
app:keywords="@string/keywords_squeeze_to_launch_gesture"/>
<com.android.settings.widget.SeekBarPreference
android:key="gesture_assist_sensitivity"