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

Commit 84d99265 authored by Eugenio's avatar Eugenio
Browse files

Merge branch 'eclair' of git://github.com/cyanogen/android_frameworks_base into eclair

parents 6f0e5cbb e0a13f2a

core/java/android/server/BluetoothEventLoop.java

+8 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 The Android Open Source Project

 * Copyright (c) 2010, Code Aurora Forum. All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -383,6 +384,13 @@ class BluetoothEventLoop { 
            if (propValues[1].equals("true")) {

                intent = new Intent(BluetoothDevice.ACTION_ACL_CONNECTED);

            } else {

                // Check and clean-up if bonding is in progress

                if (mBluetoothService.getBondState().getBondState(address) ==

                        BluetoothDevice.BOND_BONDING) {

                    mBluetoothService.getBondState().setBondState(address,

                          BluetoothDevice.BOND_NONE);

                }



                intent = new Intent(BluetoothDevice.ACTION_ACL_DISCONNECTED);

            }

            intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);

core/res/res/values-zh-rCN/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -124,8 +124,9 @@ 
    <string name="screen_lock" msgid="799094655496098153">"屏幕锁定"</string>

    <string name="power_off" msgid="4266614107412865048">"关机"</string>

    <string name="shutdown_progress" msgid="2281079257329981203">"正在关机..."</string>

    <string name="reboot_progress">"正在重启..."</string>

    <string name="shutdown_confirm" msgid="649792175242821353">"您的手机将会关机。"</string>

    <string name="reboot_system">"重启"</string>

    <string name="reboot_system">"重新启动"</string>

    <string name="reboot_confirm">"您的手机将被重启。"</string> 

    <string name="no_recent_tasks" msgid="279702952298056674">"没有最近的应用程序。"</string>

    <string name="global_actions" msgid="2406416831541615258">"手机选项"</string>
@@ -137,6 +138,7 @@ 
    <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"飞行模式"</string>

    <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"已开启飞行模式"</string>

    <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"已关闭飞行模式"</string>

    <string name="global_action_reboot">重启手机</string>

    <string name="safeMode" msgid="2788228061547930246">"安全模式"</string>

    <string name="android_system_label" msgid="6577375335728551336">"Android 系统"</string>

    <string name="permgrouplab_costMoney" msgid="5429808217861460401">"需要您付费的服务"</string>

core/res/res/values/arrays.xml

+1 −1
Original line number Diff line number Diff line
@@ -113,11 +113,11 @@ 
        <item><xliff:g id="id">phone_evdo_signal</xliff:g></item>

        <item><xliff:g id="id">data_connection</xliff:g></item>

        <item><xliff:g id="id">cdma_eri</xliff:g></item>

        <item><xliff:g id="id">wifi</xliff:g></item>

        <item><xliff:g id="id">tty</xliff:g></item>

        <item><xliff:g id="id">volume</xliff:g></item>

        <item><xliff:g id="id">mute</xliff:g></item>

        <item><xliff:g id="id">speakerphone</xliff:g></item>

        <item><xliff:g id="id">wifi</xliff:g></item>

        <item><xliff:g id="id">tty</xliff:g></item>

        <item><xliff:g id="id">bluetooth</xliff:g></item>

        <item><xliff:g id="id">gps</xliff:g></item>