Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5569e3a3 authored by Matthew Fritze's avatar Matthew Fritze Committed by android-build-merger
Browse files

Merge "Remove Language and Input duplicates" into oc-dev 

am: 6f4a6a73

Change-Id: Id6639a9dc08c1a27cf1bc4ed7969cc54a4bd2df2
parents af1a6620 6f4a6a73

res/xml/configure_notification_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"/>

res/xml/display_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -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" />

res/xml/language_and_input.xml

+7 −7
Original line number Diff line number Diff line
@@ -66,32 +66,32 @@ 
        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_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"/>



        <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"/>
@@ -105,7 +105,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"/>

res/xml/manage_assist.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"/>

src/com/android/settings/DisplaySettings.java

+5 −2
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ public class DisplaySettings extends DashboardFragment { 


    private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";

    private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";

    private static final String KEY_PICK_UP = "gesture_pick_up_display_summary";

    private static final String KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen_display_summary";



    @Override

    public int getMetricsCategory() {
@@ -100,9 +102,10 @@ public class DisplaySettings extends DashboardFragment { 
        controllers.add(new ScreenSaverPreferenceController(context));

        AmbientDisplayConfiguration ambientDisplayConfig = new AmbientDisplayConfiguration(context);

        controllers.add(new PickupGesturePreferenceController(

                context, lifecycle, ambientDisplayConfig, UserHandle.myUserId()));

                context, lifecycle, ambientDisplayConfig, UserHandle.myUserId(), KEY_PICK_UP));

        controllers.add(new DoubleTapScreenPreferenceController(

                context, lifecycle, ambientDisplayConfig, UserHandle.myUserId()));

                context, lifecycle, ambientDisplayConfig, UserHandle.myUserId(),

                KEY_DOUBLE_TAP_SCREEN));

        controllers.add(new TapToWakePreferenceController(context));

        controllers.add(new TimeoutPreferenceController(context, KEY_SCREEN_TIMEOUT));

        controllers.add(new VrDisplayPreferenceController(context));