am 39c3d10b: am 0e2ab4f8: New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275

Merge commit '39c3d10bfccd74b26b045e3d6a712d282fba88d8'

* commit '39c3d10bfccd74b26b045e3d6a712d282fba88d8':
  New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275

3 files changed, 40 insertions, 7 deletions

diff --git a/res/xml/dock_settings.xml b/res/xml/dock_settings.xml
new file mode 100644
index 0000000..43e9fa5
--- /dev/null
+++ b/res/xml/dock_settings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/dock_settings_title"
+    android:key="parent">
+
+    <PreferenceScreen
+        android:key="dock_audio"
+        android:title="@string/dock_audio_settings_title"
+        android:summary="@string/dock_settings_summary"
+        android:widgetLayout="@*android:layout/preference_dialog" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 79a777d..0fe502e 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -133,6 +133,17 @@
                 android:targetClass="com.android.settings.LanguageSettings" />
         </com.android.settings.IconPreferenceScreen>
 
+        <!-- Dock -->
+
+        <com.android.settings.IconPreferenceScreen
+            android:key="dock_settings"
+            android:title="@string/dock_settings">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.DockSettings" />
+        </com.android.settings.IconPreferenceScreen>
+
         <!-- Accessibility feedback -->
 
         <com.android.settings.IconPreferenceScreen
diff --git a/res/xml/sound_and_display_settings.xml b/res/xml/sound_and_display_settings.xml
index e3e3a8e..9ac3692 100644
--- a/res/xml/sound_and_display_settings.xml
+++ b/res/xml/sound_and_display_settings.xml
@@ -47,13 +47,6 @@
                 android:order="3"
                 android:streamType="music" />
 
-        <PreferenceScreen
-                android:key="dock_settings"
-                android:order="4"
-                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"
                 android:title="@string/ringtone_title"