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

Commit 283ac08e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "GesturesSettingPreferenceController to Toggle" into pi-dev

parents b90e5aff 3c4c3fc5

res/xml/ambient_display_settings.xml

+5 −3
Original line number Diff line number Diff line
@@ -35,12 +35,14 @@ 
        <Preference

            android:key="ambient_display_double_tap"

            android:title="@string/ambient_display_title"

            android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />

            android:fragment="com.android.settings.gestures.DoubleTapScreenSettings"

            settings:controller="com.android.settings.gestures.DoubleTapScreenPreferenceController" />



        <Preference

            android:key="ambient_display_pick_up"

            android:title="@string/ambient_display_pickup_title"

            android:fragment="com.android.settings.gestures.PickupGestureSettings" />

            android:fragment="com.android.settings.gestures.PickupGestureSettings"

            settings:controller="com.android.settings.gestures.PickupGesturePreferenceController" />



    </PreferenceCategory>

res/xml/assist_gesture_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
    <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"

        app:controller="com.android.settings.gestures.AssistGestureSettingsPreferenceController" />



</PreferenceScreen>

res/xml/configure_notification_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ 
    <Preference

        android:key="gesture_swipe_down_fingerprint_notifications"

        android:title="@string/fingerprint_swipe_for_notifications_title"

        android:fragment="com.android.settings.gestures.SwipeToNotificationSettings" />

        android:fragment="com.android.settings.gestures.SwipeToNotificationSettings"

        settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController" />



    <com.android.settingslib.RestrictedPreference

        android:key="zen_mode_notifications"

res/xml/double_tap_power_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
        android:key="gesture_double_tap_power"

        android:title="@string/double_tap_power_for_camera_title"

        android:summary="@string/double_tap_power_for_camera_summary"

        app:keywords="@string/keywords_gesture" />

        app:keywords="@string/keywords_gesture"

        app:controller="com.android.settings.gestures.DoubleTapPowerPreferenceController" />



</PreferenceScreen>
 
 No newline at end of file

res/xml/double_tap_screen_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
        android:key="gesture_double_tap_screen"

        android:title="@string/ambient_display_title"

        android:summary="@string/ambient_display_summary"

        app:keywords="@string/keywords_gesture" />

        app:keywords="@string/keywords_gesture"

        app:controller="com.android.settings.gestures.DoubleTapScreenPreferenceController" />



</PreferenceScreen>
 
 No newline at end of file