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

Commit 3afccb8d authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents 686042e0 d6b9d078

core/java/com/android/internal/os/PowerProfile.java

+9 −0
Original line number Diff line number Diff line
@@ -46,6 +46,15 @@ public class PowerProfile { 
     */

    public static final String POWER_CPU_IDLE = "cpu.idle";



    /**

     * Power consumption when CPU is awake (when a wake lock is held).  This

     * should be 0 on devices that can go into full CPU power collapse even

     * when a wake lock is held.  Otherwise, this is the power consumption in

     * addition to POWERR_CPU_IDLE due to a wake lock being held but with no

     * CPU activity.

     */

    public static final String POWER_CPU_AWAKE = "cpu.awake";



    /**

     * Power consumption when CPU is in power collapse mode.

     */

core/jni/android_app_NativeActivity.cpp

+2 −0
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ static int mainWorkCallback(int fd, int events, void* data) { 
                code->env->CallVoidMethod(code->clazz,

                        gNativeActivityClassInfo.dispatchUnhandledKeyEvent, inputEventObj);

                checkAndClearExceptionFromCallback(code->env, "dispatchUnhandledKeyEvent");

                code->env->DeleteLocalRef(inputEventObj);

                code->nativeInputQueue->finishEvent(keyEvent, true);

            }

            int seq;
@@ -589,6 +590,7 @@ static int mainWorkCallback(int fd, int events, void* data) { 
                code->env->CallVoidMethod(code->clazz,

                        gNativeActivityClassInfo.preDispatchKeyEvent, inputEventObj, seq);

                checkAndClearExceptionFromCallback(code->env, "preDispatchKeyEvent");

                code->env->DeleteLocalRef(inputEventObj);

            }

        } break;

        case CMD_FINISH: {

core/res/res/values-ru/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -864,7 +864,7 @@ 
    <string name="accessibility_compound_button_selected" msgid="5612776946036285686">"отмечено"</string>

    <string name="accessibility_compound_button_unselected" msgid="8864512895673924091">"не проверено"</string>

    <string name="grant_credentials_permission_message_header" msgid="6824538733852821001">"Одна или несколько программ требуют разрешения для доступа к вашему аккаунту сейчас и в дальнейшем."</string>

    <string name="grant_credentials_permission_message_footer" msgid="3125211343379376561">"Разрешить этот запрос?"</string>

    <string name="grant_credentials_permission_message_footer" msgid="3125211343379376561">"Разрешить доступ?"</string>

    <string name="grant_permissions_header_text" msgid="2722567482180797717">"Запрос доступа"</string>

    <string name="allow" msgid="7225948811296386551">"Разрешить"</string>

    <string name="deny" msgid="2081879885755434506">"Отклонить"</string>

core/res/res/values-sv/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ 
    <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Tryck på Menu om du vill låsa upp."</string>

    <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Rita grafiskt lösenord för att låsa upp"</string>

    <string name="lockscreen_emergency_call" msgid="5347633784401285225">"Nödsamtal"</string>

    <string name="lockscreen_return_to_call" msgid="5244259785500040021">"Återgå till samtalet"</string>

    <string name="lockscreen_return_to_call" msgid="5244259785500040021">"Tillbaka till samtal"</string>

    <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Korrekt!"</string>

    <string name="lockscreen_pattern_wrong" msgid="4817583279053112312">"Försök igen"</string>

    <string name="lockscreen_plugged_in" msgid="613343852842944435">"Laddar (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ 
    <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"寫入瀏覽器的記錄與書籤"</string>

    <string name="permdesc_writeHistoryBookmarks" msgid="945571990357114950">"允許應用程式修改儲存在電話上的瀏覽記錄或書籤。請注意：惡意應用程式可能會使用此選項來清除或修改您瀏覽器的資料。"</string>

    <string name="permlab_setAlarm" msgid="5924401328803615165">"在鬧鐘應用程式中設定鬧鈴"</string>

    <string name="permdesc_setAlarm" msgid="5966966598149875082">"允許應用程式設定您所安裝的鬧鐘應用程式執行鬧鈴功能 (有些鬧鐘應用程式並不支援此功能)。"</string>

    <string name="permdesc_setAlarm" msgid="5966966598149875082">"允許應用程式在安裝的鬧鐘應用程式中設定鬧鐘，某些鬧鐘應用程式可能無法執行這項功能。"</string>

    <string name="permlab_writeGeolocationPermissions" msgid="4715212655598275532">"修改瀏覽器地理資訊的權限"</string>

    <string name="permdesc_writeGeolocationPermissions" msgid="4011908282980861679">"允許應用程式修改瀏覽器的地理位置權限，惡意應用程式可能會透過此方式允許將您的位置資訊任意傳送給某些網站。"</string>

    <string name="save_password_message" msgid="767344687139195790">"是否記住此密碼？"</string>