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

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

Browse Source 
Merge commit '0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a' into eclair-plus-aosp

* commit '0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a':
  New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275
This commit is contained in:
Amith Yamasani
2010-01-18 23:42:44 -08:00
committed by Android Git Automerger
parent 3b7ffa5eef 0e2ab4f884
commit 39c3d10bfc
8 changed files with 198 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -953,8 +953,8 @@
<!-- Dock not found dialog title -->
<string name="dock_not_found_title">Dock not found</string>
<!-- Dock not found dialog text -->
<string name="dock_not_found_text">You must dock the phone to configure audio settings for that dock</string>
<string name="dock_not_found_text">The phone must be docked to configure dock audio</string>
<!-- Acounts & Sync settings screen setting option name to go into the screen for data sync settings-->
<string name="sync_settings">Accounts &amp; sync</string>
<!-- Main Settings screen setting option summary text for the itme to go into the screen with data sync settings-->

29
res/xml/dock_settings.xml Normal file
View File

@@ -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>

11
res/xml/settings.xml
View File

@@ -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

7
res/xml/sound_and_display_settings.xml
View File

@@ -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"