Merge "Add a setting for the volume hush gesture" into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
395345c0ad
@@ -1095,4 +1095,17 @@
|
||||
<item>no</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="gesture_prevent_ringing_entries" translatable="false">
|
||||
<item>@string/prevent_ringing_option_vibrate</item>
|
||||
<item>@string/prevent_ringing_option_mute</item>
|
||||
<item>@string/prevent_ringing_option_none</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Keep in sync with Settings.Secure.VOLUME_HUSH_* -->
|
||||
<string-array name="gesture_prevent_ringing_values" translatable="false">
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
<item>0</item>
|
||||
</string-array>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -9599,6 +9599,23 @@
|
||||
<!-- Summary for battery Suggestion. [CHAR LIMIT=55] -->
|
||||
<string name="battery_suggestion_summary"></string>
|
||||
|
||||
<!-- Title for prevent ringing gesture screen -->
|
||||
<string name="gesture_prevent_ringing_screen_title">Prevent ringing</string>
|
||||
<!-- Title for prevent ringing setting -->
|
||||
<string name="gesture_prevent_ringing_title">Press Power & Volume Up together</string>
|
||||
<!-- Option for prevent ringing setting -->
|
||||
<string name="prevent_ringing_option_vibrate">Vibrate</string>
|
||||
<!-- Option for prevent ringing setting -->
|
||||
<string name="prevent_ringing_option_mute">Mute</string>
|
||||
<!-- 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>
|
||||
<!-- Summary for prevent ringing setting -->
|
||||
<string name="prevent_ringing_option_mute_summary">Mute all calls and notifications</string>
|
||||
<!-- Summary for prevent ringing setting -->
|
||||
<string name="prevent_ringing_option_none_summary">Do nothing</string>
|
||||
|
||||
<!-- Title for detail page of wifi network [CHAR LIMIT=30] -->
|
||||
<string name="pref_title_network_details">Network details</string>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user