PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename panic gesture to emergency gesture in Settings"

Browse Source
This commit is contained in:
Fan Zhang
2020-10-28 17:02:21 +00:00
committed by Android (Google) Code Review
parent de36a60bd5 f797a48af6
commit 005b47249e
9 changed files with 76 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/xml/panic_gesture_settings.xml → res/xml/emergency_gesture_settings.xml
View File

@@ -18,29 +18,29 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/panic_gesture_screen_title">
android:title="@string/emergency_gesture_screen_title">
<com.android.settings.widget.VideoPreference
android:key="panic_button_screen_video"
android:key="emergency_gesture_screen_video"
app:animation="@raw/gesture_double_tap"
app:preview="@drawable/gesture_double_tap"/>
<SwitchPreference
android:key="gesture_panic_button"
android:title="@string/panic_gesture_screen_title"
android:summary="@string/panic_gesture_screen_summary"
android:key="gesture_emergency_button"
android:title="@string/emergency_gesture_screen_title"
android:summary="@string/emergency_gesture_screen_summary"
android:icon="@drawable/ic_hand_gesture"
app:keywords="@string/keywords_gesture"
app:controller="com.android.settings.gestures.PanicGesturePreferenceController"
app:controller="com.android.settings.gestures.EmergencyGesturePreferenceController"
app:allowDividerAbove="true"/>
<SwitchPreference
android:key="panic_gesture_sound"
android:key="emergency_gesture_sound"
android:icon="@drawable/ic_hearing"
android:title="@string/panic_gesture_sound_setting_title"
android:summary="@string/panic_gesture_sound_setting_summary"
android:title="@string/emergency_gesture_sound_setting_title"
android:summary="@string/emergency_gesture_sound_setting_summary"
app:keywords="@string/keywords_gesture"
app:controller="com.android.settings.gestures.PanicGestureSoundPreferenceController"
app:controller="com.android.settings.gestures.EmergencyGestureSoundPreferenceController"
app:allowDividerAbove="true"/>
</PreferenceScreen>

8
res/xml/gestures.xml
View File

@@ -21,10 +21,10 @@
android:title="@string/gesture_preference_title">
<Preference
android:key="gesture_panic_button_summary"
android:title="@string/panic_gesture_screen_title"
android:fragment="com.android.settings.gestures.PanicGestureSettings"
settings:controller="com.android.settings.gestures.PanicGesturePreferenceController" />
android:key="gesture_emergency_summary"
android:title="@string/emergency_gesture_screen_title"
android:fragment="com.android.settings.gestures.EmergencyGestureSettings"
settings:controller="com.android.settings.gestures.EmergencyGesturePreferenceController" />
<Preference
android:key="gesture_assist_input_summary"