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

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

Merge "Prevent ringing updates" into pi-dev

parents 2c15909b 584aba1f
Loading
Loading
Loading
Loading
+0 −0

Empty file added.

+0 −0

Empty file added.

+5 −3
Original line number Diff line number Diff line
@@ -9875,6 +9875,8 @@
    <string name="gesture_prevent_ringing_screen_title">Prevent ringing</string>
    <!-- Title for prevent ringing setting -->
    <string name="gesture_prevent_ringing_title">Press Power &amp; Volume Up together</string>
    <!-- Title for prevent ringing setting -->
    <string name="gesture_prevent_ringing_sound_title">Shortcut to prevent ringing</string>
    <!-- Option for prevent ringing setting -->
    <string name="prevent_ringing_option_vibrate">Vibrate</string>
    <!-- Option for prevent ringing setting -->
@@ -9882,11 +9884,11 @@
    <!-- Option for prevent ringing setting -->
    <string name="prevent_ringing_option_none">Do nothing</string>
    <!-- Summary for prevent ringing setting -->
    <string name="prevent_ringing_option_vibrate_summary">Vibrate all calls and notifications</string>
    <string name="prevent_ringing_option_vibrate_summary">On (vibrate)</string>
    <!-- Summary for prevent ringing setting -->
    <string name="prevent_ringing_option_mute_summary">Mute all calls and notifications</string>
    <string name="prevent_ringing_option_mute_summary">On (mute)</string>
    <!-- Summary for prevent ringing setting -->
    <string name="prevent_ringing_option_none_summary">Do nothing</string>
    <string name="prevent_ringing_option_none_summary">Off</string>
    <!-- Title for detail page of wifi network [CHAR LIMIT=30] -->
    <string name="pref_title_network_details">Network details</string>
+2 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@
    <Preference
        android:key="gesture_prevent_ringing_summary"
        android:title="@string/gesture_prevent_ringing_screen_title"
        android:fragment="com.android.settings.gestures.PreventRingingGestureSettings" />
        android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"
        settings:controller="com.android.settings.gestures.PreventRingingPreferenceController" />

</PreferenceScreen>
+4 −2
Original line number Diff line number Diff line
@@ -21,15 +21,17 @@
    android:key="gesture_prevent_ringing_screen"
    android:title="@string/gesture_prevent_ringing_screen_title">

    <!-- TODO: Add video preference when it exists -->
    <com.android.settings.widget.VideoPreference
        android:key="gesture_prevent_ringing_video" />
        android:key="gesture_prevent_ringing_video"
        app:animation="@raw/gesture_prevent_ringing"
        app:preview="@drawable/gesture_prevent_ringing" />

    <ListPreference
        android:key="gesture_prevent_ringing"
        android:title="@string/gesture_prevent_ringing_title"
        android:entries="@array/gesture_prevent_ringing_entries"
        android:entryValues="@array/gesture_prevent_ringing_values"
        app:controller="com.android.settings.gestures.PreventRingingPreferenceController"
        app:keywords="@string/keywords_gesture" />

</PreferenceScreen>
 No newline at end of file
Loading