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

Merge changes from topic 'update mono audio' into nyc-dev

Browse Source 
* changes:
  Add mono audio to AccessibilitySettings
  Remove mono audio from SoundSettings
This commit is contained in:
Andy Hung
2016-02-27 02:50:04 +00:00
committed by Android (Google) Code Review
parent 1ea368b5d5 acef55d099
commit a77940d0f5
5 changed files with 36 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/values/strings.xml
View File

@@ -3868,6 +3868,10 @@
<string name="accessibility_toggle_speak_password_preference_title">Speak passwords</string>
<!-- Title for the accessibility preference for enabling/disabling large icons for mouse/trackpad pointers. [CHAR LIMIT=35] -->
<string name="accessibility_toggle_large_pointer_icon_title">Large mouse pointer</string>
<!-- Title for the accessibility preference for master mono. [CHAR LIMIT=35] -->
<string name="accessibility_toggle_master_mono_title">Mono audio</string>
<!-- Summary for the accessibility preference for master mono. [CHAR LIMIT=50] -->
<string name="accessibility_toggle_master_mono_summary">Combine channels when playing audio</string>
<!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
<string name="accessibility_long_press_timeout_preference_title">Tap &amp; hold delay</string>
<!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
@@ -5823,15 +5827,6 @@
<!-- Sound: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
<string name="vibrate_when_ringing_title">Also vibrate for calls</string>
<!-- Sound: Title for the option managing mono audio output. [CHAR LIMIT=30] -->
<string name="master_mono_title">Mono playback</string>
<!-- Sound: Mono audio: Summary for mono audio output when enabled. [CHAR LIMIT=40] -->
<string name="master_mono_on">Always play back audio in mono</string>
<!-- Sound: Mono audio: Summary for mono audio output when disabled. [CHAR LIMIT=40] -->
<string name="master_mono_off">Always play back audio in mono</string>
<!-- Sound: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->
<string name="other_sound_settings">Other sounds</string>

6
res/xml/accessibility_settings.xml
View File

@@ -76,6 +76,12 @@
android:key="toggle_large_pointer_icon"
android:title="@string/accessibility_toggle_large_pointer_icon_title" />
<SwitchPreference
android:key="toggle_master_mono"
android:title="@string/accessibility_toggle_master_mono_title"
android:summary="@string/accessibility_toggle_master_mono_summary"
android:persistent="false"/>
<PreferenceScreen
android:fragment="com.android.settings.accessibility.ToggleGlobalGesturePreferenceFragment"
android:key="enable_global_gesture_preference_screen"

6
res/xml/sound_settings.xml
View File

@@ -49,12 +49,6 @@
android:key="vibrate_when_ringing"
android:title="@string/vibrate_when_ringing_title" />
<!-- Master mono -->
<SwitchPreference
android:key="master_mono"
android:title="@string/master_mono_title"
android:summaryOn="@string/master_mono_on"
android:summaryOff="@string/master_mono_off" />
<!-- Interruptions -->
<com.android.settingslib.RestrictedPreference