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

am a11c5723: am 2ffa95fd: am 0bd445b9: b/2296110 New Dialog which appears when phone is place on dock.

Browse Source 
Merge commit 'a11c57234f99f987cd4bdc7f2aa6d02a54ce3032'

* commit 'a11c57234f99f987cd4bdc7f2aa6d02a54ce3032':
  b/2296110 New Dialog which appears when phone is place on dock.
This commit is contained in:
Michael Chan
2009-12-04 04:32:44 -08:00
committed by Android Git Automerger
parent 117d5bedff a11c57234f
commit a7703377da
8 changed files with 479 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/values/strings.xml
View File

@@ -631,6 +631,19 @@
<!-- Bluetooth settings. Connection options screen. The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
<string name="bluetooth_opp_profile_summary_use_for">Use for file transfer</string>
<!-- Bluetooth settings. Dock Setting Title -->
<string name="bluetooth_dock_settings">Dock Settings</string>
<!-- Bluetooth settings. Dock Setting Dialog Title -->
<string name="bluetooth_dock_settings_title">Use dock for audio</string>
<!-- Bluetooth settings. Dock Setting Dialog - Checkbox selection 1: Use dock as speaker phone -->
<string name="bluetooth_dock_settings_headset">As speaker phone</string>
<!-- Bluetooth settings. Dock Setting Dialog - Checkbox selection 2: Use dock for media audio -->
<string name="bluetooth_dock_settings_a2dp">For music and media</string>
<!-- Bluetooth settings. Dock Setting Dialog - Remember setting and don't ask user again -->
<string name="bluetooth_dock_settings_remember">Remember settings</string>
<!-- Bluetooth settings. Dock Setting Dialog - Hint for the user to chagne setting after checking "remember settings" -->
<string name="bluetooth_dock_settings_hint">"Change with Settings under Sound &amp; display &gt; Dock audio</string>
<!-- Wi-Fi settings -->
<!-- Used in the 2nd-level settings screen to turn on Wi-Fi -->
<string name="wifi">Wi-Fi</string>
@@ -883,7 +896,9 @@
<!-- Sound settings screen, setting option summary text -->
<string name="media_volume_summary">Set volume for music and videos</string>
<!-- Sound settings screen, dock settings -->
<string name="dock_settings_title">Dock settings</string>
<string name="dock_settings_title">Dock audio</string>
<!-- Sound settings screen, dock settings summary-->
<string name="dock_settings_summary">Audio settings for the attached dock</string>
<!-- Sound settings screen, setting check box label -->
<string name="dtmf_tone_enable_title">Audible touch tones</string>
<!-- Sound settings screen, setting option summary text when check box is selected -->