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

Commit 682a3af3 authored by takuo's avatar takuo
Browse files

Merge remote branch 'cyanogen/eclair' into eclair

parents 379b2ef5 74bc7b75

AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -235,6 +235,14 @@ 
            </intent-filter>

        </activity>



        <activity android:name="SilentChannels" android:label="@string/silent_channels_label">

            <intent-filter>

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

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

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

            </intent-filter>

        </activity>



        <activity android:name="DockSettings"

                android:label="@string/dock_settings_title"

                android:clearTaskOnLaunch="true"

res/values-de/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -647,6 +647,8 @@ 
    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Muster sichtbar"</string>

    <string name="lockpattern_settings_enable_visible_dots_title">Punkte sichtbar</string>

    <string name="lockpattern_settings_show_error_path">Zeige fehlerhaften Pfad bei Fehler</string>

    <string name="lockpattern_settings_show_unlock_msg">Entsperrungsmeldung</string>

    <string name="lockpattern_settings_show_unlock_error_msg">Entsperrungs-Fehlermeldung</string>

    <string name="lockpattern_settings_show_custom_msg">Zeige eigene Nachricht</string>

    <string name="lockpattern_settings_show_sliders">Zeige Schieber</string>

    <string name="lockpattern_settings_custom_msg">Eigene Nachricht</string>

res/values/strings.xml

+34 −0
Original line number Diff line number Diff line
@@ -950,6 +950,40 @@ 
    <string name="audio_record_proc_title">Noise cancellation</string>

    <!-- Sound settings screen, setting option summary text -->

    <string name="audio_record_proc_summary">Suppress background noise when speaking or recording.</string>

    <!-- Sound settings screen, setting screen option name to enter menu to choose what silent mode affects -->

    <string name="silent_mode_settings_title">Silent mode settings</string>

    <!-- Sound settings screen, setting option summary text -->

    <string name="silent_mode_settings_summary">Select which sounds are muted in silent mode.</string>



    <!-- Sound and alerts settings, silent mode submenu -->

    <!-- Screen title -->

    <string name="silent_channels_label">Select sounds muted in silent mode</string>

    <string name="silent_mode_settings_reset_to_default_title">Reset to defaults</string>

    <string name="silent_mode_settings_reset_to_default_summary"></string>

    <string name="silent_mode_settings_mute_all_title">Mute all</string>

    <string name="silent_mode_settings_mute_all_summary"></string>



    <string name="silent_mode_settings_voice_call_title">Voice calls</string>

    <string name="silent_mode_settings_system_title">System sounds</string>

    <string name="silent_mode_settings_ring_title">Call rings</string>

    <string name="silent_mode_settings_music_title">Music</string>

    <string name="silent_mode_settings_alarm_title">Alarms</string>

    <string name="silent_mode_settings_notification_title">Notifications</string>

    <string name="silent_mode_settings_bluetooth_title">Bluetooth output</string>

    <string name="silent_mode_settings_system_enforced_title">System-enforced</string>

    <string name="silent_mode_settings_dtmf_title">DTMF tones</string>

    <string name="silent_mode_settings_tts_title">Text-to-speech</string>



    <string name="silent_mode_settings_voice_call_summary">Don\'t hear active calls in silent mode.</string>

    <string name="silent_mode_settings_system_summary">Silent mode silences system sounds.</string>

    <string name="silent_mode_settings_ring_summary">Don\'t ring for incoming calls in silent mode.</string>

    <string name="silent_mode_settings_music_summary">Don\'t play music in silent mode.</string>

    <string name="silent_mode_settings_alarm_summary">Don\'t play alarms in silent mode.</string>

    <string name="silent_mode_settings_notification_summary">Don\'t play notifications in silent mode.</string>

    <string name="silent_mode_settings_bluetooth_summary">Don\'t play to bluetooth in silent mode.</string>

    <string name="silent_mode_settings_system_enforced_summary">Don\'t play required sounds in silent mode.</string>

    <string name="silent_mode_settings_dtmf_summary">Don\'t play dialing sounds in silent mode.</string>

    <string name="silent_mode_settings_tts_summary">Don\'t play text-to-speech in silent mode.</string>



    <!-- Dock settings title, top level -->

    <string name="dock_settings">Dock</string>

res/xml/silent_mode_settings.xml

0 → 100644
+111 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 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:key="silent_mode_settings">



        <Preference

                android:key="reset_to_default"

                android:title="@string/silent_mode_settings_reset_to_default_title"

                android:summary="@string/silent_mode_settings_reset_to_default_summary"

                android:persistent="false" />



        <Preference

                android:key="mute_all"

                android:title="@string/silent_mode_settings_mute_all_title"

                android:summary="@string/silent_mode_settings_mute_all_summary"

                android:persistent="false" />



        <!-- Don't allow disabling the voice call channel.  It doesn't make sense to do

             that and it'll probably just confuse people. -->

        <!--

        <CheckBoxPreference

                android:key="stream_voice_call"

                android:title="@string/silent_mode_settings_voice_call_title"

                android:summary="@string/silent_mode_settings_voice_call_summary"

                android:persistent="false" />

        -->

        <CheckBoxPreference

                android:key="stream_system"

                android:title="@string/silent_mode_settings_system_title"

                android:summary="@string/silent_mode_settings_system_summary"

                android:persistent="false" />



        <CheckBoxPreference

                android:key="stream_ring"

                android:title="@string/silent_mode_settings_ring_title"

                android:summary="@string/silent_mode_settings_ring_summary"

                android:persistent="false" />



        <CheckBoxPreference

                android:key="stream_music"

                android:title="@string/silent_mode_settings_music_title"

                android:summary="@string/silent_mode_settings_music_summary"

                android:persistent="false" />



        <CheckBoxPreference

                android:key="stream_alarm"

                android:title="@string/silent_mode_settings_alarm_title"

                android:summary="@string/silent_mode_settings_alarm_summary"

                android:persistent="false" />



        <CheckBoxPreference

                android:key="stream_notification"

                android:title="@string/silent_mode_settings_notification_title"

                android:summary="@string/silent_mode_settings_notification_summary"

                android:persistent="false" />



        <!-- I'm not sure exactly what this silences.  Let's hide it until it's tested

             to make sure it has any value.  It's pointless to silence a bluetooth headset. -->

        <!--

        <CheckBoxPreference

                android:key="stream_bluetooth"

                android:title="@string/silent_mode_settings_bluetooth_title"

                android:summary="@string/silent_mode_settings_bluetooth_summary"

                android:persistent="false" />

        -->



        <!-- Don't show the "system enforced" channel; users don't know what that means,

             and if we want to allow silencing the camera sound, that should be done in

             the camera settings.  Maybe we should tie this one to SYSTEM. -->

        <!--

        <CheckBoxPreference

                android:key="stream_system_enforced"

                android:title="@string/silent_mode_settings_system_enforced_title"

                android:summary="@string/silent_mode_settings_system_enforced_summary"

                android:persistent="false" />

        -->



        <!-- Hide the DTMF toggle.  DTMF sounds seem to be silenced regardless of this (they

             must be going over a different channel). -->

        <!--

        <CheckBoxPreference

                android:key="stream_dtmf"

                android:title="@string/silent_mode_settings_dtmf_title"

                android:summary="@string/silent_mode_settings_dtmf_summary"

                android:persistent="false" />

        -->



        <!-- I havn't tested this one. -->

        <!--

        <CheckBoxPreference

                android:key="stream_tts"

                android:title="@string/silent_mode_settings_tts_title"

                android:summary="@string/silent_mode_settings_tts_summary"

                android:persistent="false" />

        -->

</PreferenceScreen>

res/xml/sound_and_display_settings.xml

+10 −0
Original line number Diff line number Diff line
@@ -29,6 +29,16 @@ 
                android:order="1"

                android:disableDependentsState="true" />



        <PreferenceScreen

                android:title="@string/silent_mode_settings_title"

                android:summary="@string/silent_mode_settings_summary"

                android:order="10">

                <intent

                        android:action="android.intent.action.MAIN"

                        android:targetPackage="com.android.settings"

                        android:targetClass="com.android.settings.SilentChannels" />

        </PreferenceScreen>



        <com.android.settings.RingerVolumePreference

                android:key="ring_volume"

                android:title="@string/ring_volume_title"