b/2296110 New Dialog which appears when phone is place on dock.

Change-Id: I58b216ee9b4ca9ce16210309358c0512271e128e

3 files changed, 57 insertions, 21 deletions

diff --git a/res/layout/remember_dock_setting.xml b/res/layout/remember_dock_setting.xml
new file mode 100644
index 0000000..a19ca7c
--- /dev/null
+++ b/res/layout/remember_dock_setting.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<CheckBox
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/remember"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:text="@string/bluetooth_dock_settings_remember"
+    android:focusable="true"
+    android:clickable="true" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 85ca4d4..42905fe 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -643,6 +643,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>
@@ -895,7 +908,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 -->
diff --git a/res/xml/sound_and_display_settings.xml b/res/xml/sound_and_display_settings.xml
index 151b0fb..1ffbdbf 100644
--- a/res/xml/sound_and_display_settings.xml
+++ b/res/xml/sound_and_display_settings.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-        
+
     <PreferenceCategory android:key="sound_settings"
             android:title="@string/sound_settings">
 
@@ -50,12 +50,9 @@
         <PreferenceScreen
                 android:key="dock_settings"
                 android:order="4"
-                android:title="@string/dock_settings_title">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.bluetooth.DockSettingsActivity" />
-        </PreferenceScreen>
+                android:title="@string/dock_settings_title"
+                android:summary="@string/dock_settings_summary"
+                android:widgetLayout="@*android:layout/preference_dialog" />
 
         <com.android.settings.DefaultRingtonePreference
                 android:key="ringtone"
@@ -66,14 +63,14 @@
                 android:dependency="silent"
                 android:order="5"
                 android:ringtoneType="ringtone" />
-    
+
         <CheckBoxPreference
                 android:key="vibrate"
                 android:title="@string/vibrate_title"
                 android:summary="@string/vibrate_summary"
                 android:order="6"
                 android:persistent="false" />
-    
+
         <com.android.settings.DefaultRingtonePreference
                 android:key="notification_sound"
                 android:title="@string/notification_sound_title"
@@ -139,15 +136,15 @@
     <PreferenceCategory
             android:title="@string/display_settings">
 
-        <CheckBoxPreference 
-            android:key="accelerometer" 
-            android:title="@string/accelerometer_title" 
+        <CheckBoxPreference
+            android:key="accelerometer"
+            android:title="@string/accelerometer_title"
             android:summaryOn="@string/accelerometer_summary_on"
             android:summaryOff="@string/accelerometer_summary_off"/>
-    
-	    <ListPreference
-	        android:key="animations"
-	        android:title="@string/animations_title" 
+
+        <ListPreference
+            android:key="animations"
+            android:title="@string/animations_title"
             android:persistent="false"
             android:entries="@array/animations_entries"
             android:entryValues="@array/animations_values" />
@@ -158,7 +155,7 @@
                 android:summary="@string/brightness_summary"
                 android:dialogIcon="@drawable/ic_popup_brightness"
                 android:dialogTitle="@string/brightness" />
-            
+
         <ListPreference
                 android:key="screen_timeout"
                 android:title="@string/screen_timeout"
@@ -168,4 +165,4 @@
                 android:entryValues="@array/screen_timeout_values" />
     </PreferenceCategory>
 
-</PreferenceScreen>   
+</PreferenceScreen>