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

Merge "Prevent ringing updates" into pi-dev am: dbffb1812d

Browse Source 
am: 8176af9610

Change-Id: I880b80215cfec3897b18200b18bedbb6c899e241
This commit is contained in:
Julia Reynolds
2018-04-10 16:15:11 -07:00
committed by android-build-merger
parent 3b3e951b6f 8176af9610
commit a660cf1176
11 changed files with 35 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/gestures.xml
View File

@@ -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>

6
res/xml/prevent_ringing_gesture_settings.xml
View File

@@ -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>

10
res/xml/sound_settings.xml
View File

@@ -20,7 +20,7 @@
android:title="@string/sound_settings"
android:key="sound_settings"
settings:keywords="@string/keywords_sounds"
settings:initialExpandedChildrenCount="7">
settings:initialExpandedChildrenCount="8">
<!-- Media volume -->
<com.android.settings.notification.VolumeSeekBarPreference
@@ -70,6 +70,14 @@
settings:allowDividerAbove="true"
android:order="-120"/>
<Preference
android:key="gesture_prevent_ringing_sound"
android:title="@string/gesture_prevent_ringing_sound_title"
settings:allowDividerAbove="true"
android:order="-110"
android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"
settings:controller="com.android.settings.gestures.PreventRingingPreferenceController" />
<!-- Phone ringtone -->
<com.android.settings.DefaultRingtonePreference
android:key="ringtone"