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

Commit 330a38ab authored by takuo's avatar takuo
Browse files

Merge remote branch 'cyanogen/eclair' into eclair

parents 66059326 054b3602

res/values-de/strings.xml

+7 −2
Original line number Diff line number Diff line
@@ -404,6 +404,8 @@ 
    <string name="ring_volume_summary" msgid="8370699933709381329">"Lautstärke für eingehende Anrufe und Benachrichtigungen festlegen"</string>

    <string name="vibrate_title" msgid="5408984084125311526">"Vibration"</string>

    <string name="vibrate_summary" msgid="5224303668448643275">"Vibration für eingehende Anrufe"</string>

    <string name="speaker_notifications">Immer über Lautsprecher</string>

    <string name="speaker_notifications_summary">Benachrichtigungen immer über Lautsprecher ausgeben, auch wenn Kopfhörer angeschlossen</string>

    <string name="notification_sound_title" msgid="6316316069880531693">"Benachrichtigungston"</string>

    <string name="notification_sound_summary" msgid="7628081155578496618">"Standard-Benachrichtigungston festlegen"</string>

    <string name="notification_pulse_title" msgid="1247988024534030629">"Benachrichtigungslicht pulsieren"</string>
@@ -1089,8 +1091,8 @@ 
    <string name="untitled_apn" msgid="1230060359198685513">"Unbenannt"</string>

    <!-- Tethering settings -->

    <string name="internet_tethering">Internet-Tethering</string>

    <string name="internet_tethering_summary_on">Internet-Tethering über USB ist eingeschaltet</string>

    <string name="internet_tethering_summary_off">Internet-Tethering über USB ist ausgeschaltet</string>

    <string name="internet_tethering_summary_on">Internet-Tethering über USB und Bluetooth ist eingeschaltet</string>

    <string name="internet_tethering_summary_off">Internet-Tethering über USB und Bluetooth ist ausgeschaltet</string>



    <!-- Apps2SD -->

    <!-- Text for the "Move" button. -->
@@ -1113,4 +1115,7 @@ 
    <string name="proxy_setting">Proxy Einstellungen</string>

    <string name="proxy_setting_summary">Konfiguriere einen Proxy-Server für Internetzugriff</string>

    <string name="proxy_wifi_only">Proxy nur bei WLAN</string>



    <string name="spare_settings_title">Spare Parts</string>

    <string name="launcher_settings_title">ADW.Launcher</string>

</resources>

res/values-it/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -286,9 +286,9 @@ 
    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Usa per audio telefono"</string>

    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usa per trasferimento file"</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>

    <string name="silent_mode_settings_title">Imp. modalità silenziosa</string>

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

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

    <string name="silent_mode_settings_summary">Seleziona quali suoni disattivare in modalità silenziosa.</string>



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

    <!-- Screen title -->
@@ -1040,8 +1040,8 @@ 


    <!-- Tethering settings -->

    <string name="internet_tethering">Internet tethering</string>

    <string name="internet_tethering_summary_on">Internet tethering USB attivato</string>

    <string name="internet_tethering_summary_off">Internet tethering USB disattivato</string>

    <string name="internet_tethering_summary_on">Internet tethering via USB/BT attivato</string>

    <string name="internet_tethering_summary_off">Internet tethering via USB/BT disattivato</string>

    <!-- Sound settings screen,  category -->

    <string name="trackball_settings">Impostazioni Trackball</string>

    <!-- Sound settings screen, notification light while screen on title -->

res/values/strings.xml

+6 −2
Original line number Diff line number Diff line
@@ -888,6 +888,10 @@ 
    <!-- Sound settings screen, setting option summary text -->

    <string name="vibrate_summary">Vibrate phone for incoming calls</string>

    <!-- Sound settings screen, setting option name -->

    <string name="speaker_notifications">Always notify on speaker</string>

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

    <string name="speaker_notifications_summary">Play notifications on the speaker even when using headphones</string>

    <!-- Sound settings screen, setting option name -->

    <string name="notification_sound_title">Notification ringtone</string>

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

    <string name="notification_sound_summary">Set your default notification ringtone</string>
@@ -2281,8 +2285,8 @@ found in the list of installed applications.</string> 


    <!-- Tethering settings -->

    <string name="internet_tethering">Internet tethering</string>

    <string name="internet_tethering_summary_on">Internet tethering over USB is enabled</string>

    <string name="internet_tethering_summary_off">Internet tethering over USB is disabled</string>

    <string name="internet_tethering_summary_on">Internet tethering via USB/BT is enabled</string>

    <string name="internet_tethering_summary_off">Internet tethering via USB/BT is disabled</string>



    <!-- Apps2SD -->

    <!-- Text for the "Move" button. -->

res/xml/sound_and_display_settings.xml

+7 −0
Original line number Diff line number Diff line
@@ -75,6 +75,13 @@ 
                android:order="6"

                android:persistent="false" />



        <CheckBoxPreference

                android:key="speaker_notifications"

                android:title="@string/speaker_notifications"

                android:summary="@string/speaker_notifications_summary"

                android:order="7"

                android:persistent="false" />



        <com.android.settings.DefaultRingtonePreference

                android:key="notification_sound"

                android:title="@string/notification_sound_title"

src/com/android/settings/SoundAndDisplaySettings.java

+13 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements 


    private static final String KEY_SILENT = "silent";

    private static final String KEY_VIBRATE = "vibrate";

    private static final String KEY_SPEAKER_NOTIFICATIONS = "speaker_notifications";

    private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";

    private static final String KEY_DTMF_TONE = "dtmf_tone";

    private static final String KEY_SOUND_EFFECTS = "sound_effects";
@@ -84,6 +85,7 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements 
     * setting.

     */

    private CheckBoxPreference mVibrate;

    private CheckBoxPreference mSpeakerNotifications;

    private CheckBoxPreference mDtmfTone;

    private CheckBoxPreference mSoundEffects;

    private CheckBoxPreference mHapticFeedback;
@@ -136,6 +138,7 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements 
        mPlayMediaNotificationSounds = (CheckBoxPreference) findPreference(KEY_PLAY_MEDIA_NOTIFICATION_SOUNDS);



        mVibrate = (CheckBoxPreference) findPreference(KEY_VIBRATE);

        mSpeakerNotifications = (CheckBoxPreference) findPreference(KEY_SPEAKER_NOTIFICATIONS);

        mDtmfTone = (CheckBoxPreference) findPreference(KEY_DTMF_TONE);

        mDtmfTone.setPersistent(false);

        mDtmfTone.setChecked(Settings.System.getInt(resolver,
@@ -266,6 +269,12 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements 
            mVibrate.setChecked(vibrateSetting);

        }



	boolean speakerNotificationSetting = Settings.Secure.getInt(getContentResolver(),

                Settings.System.NOTIFICATIONS_TO_SPEAKER, 1) != 0;

        if (speakerNotificationSetting != mSpeakerNotifications.isChecked() || force) {

            mSpeakerNotifications.setChecked(speakerNotificationSetting);

        }



        int silentModeStreams = Settings.System.getInt(getContentResolver(),

                Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);

        boolean isAlarmInclSilentMode = (silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0;
@@ -369,6 +378,10 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements 
            Settings.System.putInt(getContentResolver(), Settings.System.HAPTIC_FEEDBACK_ENABLED,

                    mHapticFeedback.isChecked() ? 1 : 0);



        } else if (preference == mSpeakerNotifications) {

            Settings.System.putInt(getContentResolver(), Settings.System.NOTIFICATIONS_TO_SPEAKER,

                    mSpeakerNotifications.isChecked() ? 1 : 0);



        } else if (preference == mNotificationPulse) {

            value = mNotificationPulse.isChecked();

            Settings.System.putInt(getContentResolver(),