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

Merge "Remove Language and Input duplicates"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-18 22:37:24 +00:00
committed by Android (Google) Code Review
parent 838ec5d15b 742467ec9f
commit dd6483461f
32 changed files with 259 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/configure_notification_settings.xml
View File

@@ -39,7 +39,7 @@
android:summary="@string/summary_placeholder"/>
<SwitchPreference
android:key="gesture_swipe_down_fingerprint"
android:key="gesture_swipe_down_fingerprint_notifications"
android:title="@string/fingerprint_swipe_for_notifications_title"
android:summary="@string/fingerprint_swipe_for_notifications_summary"/>

4
res/xml/display_settings.xml
View File

@@ -97,12 +97,12 @@
android:title="@string/lift_to_wake_title" />
<Preference
android:key="gesture_double_tap_screen"
android:key="gesture_double_tap_screen_display_summary"
android:title="@string/ambient_display_title"
android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />
<Preference
android:key="gesture_pick_up"
android:key="gesture_pick_up_display_summary"
android:title="@string/ambient_display_pickup_title"
android:fragment="com.android.settings.gestures.PickupGestureSettings" />

14
res/xml/language_and_input.xml
View File

@@ -66,22 +66,22 @@
android:title="@string/gesture_preference_title">
<Preference
android:key="gesture_assist"
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"
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"
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"
android:key="gesture_pick_up_input_summary"
android:title="@string/ambient_display_pickup_title"
android:fragment="com.android.settings.gestures.PickupGestureSettings"/>
@@ -91,12 +91,12 @@
android:fragment="com.android.settings.gestures.CameraLiftTriggerSettings"/>
<Preference
android:key="gesture_double_tap_power"
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"
android:key="gesture_double_twist_input_summary"
android:title="@string/double_twist_for_camera_mode_title"
android:fragment="com.android.settings.gestures.DoubleTwistGestureSettings"/>
@@ -110,7 +110,7 @@
android:dialogTitle="@string/pointer_speed"/>
<Preference
android:key="tts_settings"
android:key="tts_settings_summary"
android:title="@string/tts_settings_title"
android:fragment="com.android.settings.tts.TextToSpeechSettings"/>

2
res/xml/manage_assist.xml
View File

@@ -26,7 +26,7 @@
android:fragment="com.android.settings.applications.assist.DefaultAssistPicker"/>
<Preference
android:key="gesture_assist"
android:key="gesture_assist_application"
android:title="@string/assist_gesture_title"
android:fragment="com.android.settings.gestures.AssistGestureSettings"/>