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

Commit c1af814e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2461233, 2461302, 2461279, 2461176, 2461341, 2461280,... 

Merge cherrypicks of [2461233, 2461302, 2461279, 2461176, 2461341, 2461280, 2461290, 2461342, 2461291, 2461216, 2461217, 2461304, 2461306, 2461381, 2461307, 2461234, 2461195, 2461308, 2461362, 2461235, 2461218, 2461363, 2461323, 2461382, 2461345] into oc-release

Change-Id: I8b54468b97b5d61335712bb04b728e502bf7bd2f
parents 3636d0a4 11b6084e

core/res/res/layout-land/time_picker_material.xml

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layoutDirection="ltr"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">
@@ -30,6 +31,7 @@ 


        <LinearLayout

            android:id="@+id/time_layout"

            android:layoutDirection="ltr"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingTop="@dimen/timepicker_radial_picker_top_margin"

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

+3 −3
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
    <string name="serviceNotProvisioned" msgid="8614830180508686666">"A szolgáltatás nincs biztosítva."</string>

    <string name="CLIRPermanent" msgid="3377371145926835671">"Nem tudja módosítani a hívó fél azonosítója beállítást."</string>

    <string name="RestrictedOnDataTitle" msgid="1322504692764166532">"Adatszolgáltatás letiltva"</string>

    <string name="RestrictedOnEmergencyTitle" msgid="3646729271176394091">"Nincs vészhívás"</string>

    <string name="RestrictedOnEmergencyTitle" msgid="3646729271176394091">"Nincs segélyhívás"</string>

    <string name="RestrictedOnNormalTitle" msgid="3179574012752700984">"Hangszolgáltatás letiltva"</string>

    <string name="RestrictedOnAllVoiceTitle" msgid="158800171499150681">"Hang- és segélyszolgáltatás letiltva"</string>

    <string name="RestrictedStateContent" msgid="4278821484643362350">"Az Ön tartózkodási helyén ideiglenesen nem áll rendelkezésre a mobilhálózaton"</string>
@@ -223,7 +223,7 @@ 
    <string name="global_actions" product="default" msgid="2406416831541615258">"Telefonbeállítások"</string>

    <string name="global_action_lock" msgid="2844945191792119712">"Képernyő lezárása"</string>

    <string name="global_action_power_off" msgid="4471879440839879722">"Kikapcsolás"</string>

    <string name="global_action_emergency" msgid="7112311161137421166">"Vészhívás"</string>

    <string name="global_action_emergency" msgid="7112311161137421166">"Segélyhívás"</string>

    <string name="global_action_bug_report" msgid="7934010578922304799">"Programhiba bejelentése"</string>

    <string name="bugreport_title" msgid="2667494803742548533">"Hibajelentés készítése"</string>

    <string name="bugreport_message" msgid="398447048750350456">"Ezzel információt fog gyűjteni az eszköz jelenlegi állapotáról, amelyet a rendszer e-mailben fog elküldeni. Kérjük, legyen türelemmel, amíg a hibajelentés elkészül, és küldhető állapotba kerül."</string>
@@ -714,7 +714,7 @@ 
    <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"A feloldáshoz vagy segélyhívás kezdeményezéséhez nyomja meg a Menü gombot."</string>

    <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"A feloldáshoz nyomja meg a Menü gombot."</string>

    <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Rajzolja le a mintát a feloldáshoz"</string>

    <string name="lockscreen_emergency_call" msgid="5298642613417801888">"Vészhívás"</string>

    <string name="lockscreen_emergency_call" msgid="5298642613417801888">"Segélyhívás"</string>

    <string name="lockscreen_return_to_call" msgid="5244259785500040021">"Hívás folytatása"</string>

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

    <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Próbálja újra"</string>

packages/SettingsLib/res/values-tr/strings.xml

+6 −6
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Bağlantı kesiliyor…"</string>

    <string name="bluetooth_connecting" msgid="8555009514614320497">"Bağlanıyor…"</string>

    <string name="bluetooth_connected" msgid="6038755206916626419">"Bağlandı"</string>

    <string name="bluetooth_pairing" msgid="1426882272690346242">"Eşleştiriliyor…"</string>

    <string name="bluetooth_pairing" msgid="1426882272690346242">"Eşleniyor…"</string>

    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Bağlandı (telefon yok)"</string>

    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Bağlandı (medya yok)"</string>

    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Bağlı (mesaj erişimi yok)"</string>
@@ -74,14 +74,14 @@ 
    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Telefon sesi için kullan"</string>

    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Dosya aktarımı için kullan"</string>

    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Giriş için kullan"</string>

    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Eşleştir"</string>

    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"EŞLEŞTİR"</string>

    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Eşle"</string>

    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"EŞLE"</string>

    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"İptal"</string>

    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Eşleme işlemi, bağlantı kurulduğunda kişilerinize ve çağrı geçmişine erişim izni verir."</string>

    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleştirilemedi."</string>

    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PIN veya parola yanlış olduğundan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleştirilemedi"</string>

    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşlenemedi."</string>

    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PIN veya parola yanlış olduğundan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşlenemedi"</string>

    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile iletişim kurulamıyor."</string>

    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Eşleştirme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tarafından reddedildi."</string>

    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Eşleme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tarafından reddedildi."</string>

    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Kablosuz kapalı."</string>

    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Kablosuz bağlantı kesildi."</string>

    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Kablosuz sinyal gücü tek çubuk."</string>

packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java

+0 −2
Original line number Diff line number Diff line
@@ -568,8 +568,6 @@ public class NotificationData { 
                mTmpRanking.getImportance());

        pw.print(indent);

        pw.println("      notification=" + n.getNotification());

        pw.print(indent);

        pw.println("      tickerText=\"" + n.getNotification().tickerText + "\"");

    }



    private static boolean isSystemNotification(StatusBarNotification sbn) {

services/core/java/com/android/server/am/KeyguardController.java

+24 −16
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.am;



import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;

import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;

import static android.view.WindowManagerPolicy.KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS;

import static android.view.WindowManagerPolicy.KEYGUARD_GOING_AWAY_FLAG_TO_SHADE;

import static android.view.WindowManagerPolicy.KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER;
@@ -34,6 +35,7 @@ import static com.android.server.wm.AppTransition.TRANSIT_UNSET; 


import android.os.IBinder;

import android.os.RemoteException;

import android.os.Trace;

import android.util.Slog;



import com.android.internal.policy.IKeyguardDismissCallback;
@@ -111,7 +113,10 @@ class KeyguardController { 
     *              etc.

     */

    void keyguardGoingAway(int flags) {

        if (mKeyguardShowing) {

        if (!mKeyguardShowing) {

            return;

        }

        Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "keyguardGoingAway");

        mWindowManager.deferSurfaceLayout();

        try {

            setKeyguardGoingAway(true);
@@ -125,8 +130,11 @@ class KeyguardController { 
            mStackSupervisor.addStartingWindowsForVisibleActivities(true /* taskSwitch */);

            mWindowManager.executeAppTransition();

        } finally {

            Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "keyguardGoingAway: surfaceLayout");

            mWindowManager.continueSurfaceLayout();

            }

            Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);



            Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);

        }

    }