Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39c3d10b authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

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

Merge commit '0e2ab4f8' into eclair-plus-aosp

* commit '0e2ab4f8':
  New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275
parents 3b7ffa5e 0e2ab4f8

AndroidManifest.xml

+13 −0
Original line number Diff line number Diff line
@@ -232,6 +232,19 @@ 
            </intent-filter>

        </activity>



        <activity android:name="DockSettings"

                android:label="@string/dock_settings_title"

                android:clearTaskOnLaunch="true"

                >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="com.android.settings.DOCK_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

        </activity>



        <activity android:name="DeviceInfoSettings" android:label="@string/device_info_settings"

                >

            <intent-filter>

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ 
    <!-- 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>

res/xml/dock_settings.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?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

res/xml/settings.xml

+11 −0
Original line number Diff line number Diff line
@@ -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

res/xml/sound_and_display_settings.xml

+0 −7
Original line number Diff line number Diff line
@@ -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"