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

Commit 6809460c authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge ab/AP4A.240925.013 into aosp-main-future" into aosp-main-future

parents 0a3583ed 87386576

core/java/android/app/ApplicationStartInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -680,6 +680,7 @@ public final class ApplicationStartInfo implements Parcelable { 
        dest.writeParcelable(mStartIntent, flags);

        dest.writeInt(mLaunchMode);

        dest.writeBoolean(mWasForceStopped);

        dest.writeLong(mMonoticCreationTimeMs);

    }



    /** @hide */

core/java/android/app/IUserSwitchObserver.aidl

+5 −5
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ package android.app; 
import android.os.IRemoteCallback;



/** {@hide} */

oneway interface IUserSwitchObserver {

interface IUserSwitchObserver {

    void onBeforeUserSwitching(int newUserId);

    void onUserSwitching(int newUserId, IRemoteCallback reply);

    void onUserSwitchComplete(int newUserId);

    void onForegroundProfileSwitch(int newProfileId);

    void onLockedBootComplete(int newUserId);

    oneway void onUserSwitching(int newUserId, IRemoteCallback reply);

    oneway void onUserSwitchComplete(int newUserId);

    oneway void onForegroundProfileSwitch(int newProfileId);

    oneway void onLockedBootComplete(int newUserId);

}

core/java/android/view/autofill/AutofillStateFingerprint.java

+0 −2
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ public final class AutofillStateFingerprint { 
            if (sDebug) {

                Log.d(TAG, "Autofillable views count prior to auth:" + autofillableViews.size());

            }

//            ArrayList<Integer> hashes = getFingerprintIds(autofillableViews);



            ArrayMap<Integer, View> hashes = getFingerprintIds(autofillableViews);

            for (Map.Entry<Integer, View> entry : hashes.entrySet()) {
@@ -123,7 +122,6 @@ public final class AutofillStateFingerprint { 
                if (view != null) {

                    int id = getEphemeralFingerprintId(view, 0 /* position irrelevant */);

                    AutofillId autofillId = view.getAutofillId();

                    autofillId.setSessionId(mSessionId);

                    mHashToAutofillIdMap.put(id, autofillId);

                } else {

                    if (sDebug) {

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

+2 −2
Original line number Diff line number Diff line
@@ -2408,9 +2408,9 @@ 
    <string name="keyboard_layout_notification_more_than_three_selected_message" msgid="1581834181578206937">"За клавиатурната подредба са зададени <xliff:g id="LAYOUT_1">%1$s</xliff:g>, <xliff:g id="LAYOUT_2">%2$s</xliff:g> и <xliff:g id="LAYOUT_3">%3$s</xliff:g>… Докоснете за промяна."</string>

    <string name="keyboard_layout_notification_multiple_selected_title" msgid="5242444914367024499">"Физическите клавиатури са конфигурирани"</string>

    <string name="keyboard_layout_notification_multiple_selected_message" msgid="6576533454124419202">"Докоснете за преглед на клавиатурите"</string>

    <string name="profile_label_private" msgid="6463418670715290696">"Частни"</string>

    <string name="profile_label_private" msgid="6463418670715290696">"Частен"</string>

    <string name="profile_label_clone" msgid="769106052210954285">"Клониране"</string>

    <string name="profile_label_work" msgid="3495359133038584618">"Служебни"</string>

    <string name="profile_label_work" msgid="3495359133038584618">"Служебен"</string>

    <string name="profile_label_work_2" msgid="4691533661598632135">"Служебни 2"</string>

    <string name="profile_label_work_3" msgid="4834572253956798917">"Служебни 3"</string>

    <string name="profile_label_test" msgid="9168641926186071947">"Тестване"</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -2154,7 +2154,7 @@ 
    <string name="nas_upgrade_notification_enable_action" msgid="3046406808378726874">"Uredu"</string>

    <string name="nas_upgrade_notification_disable_action" msgid="3794833210043497982">"Isključi"</string>

    <string name="nas_upgrade_notification_learn_more_action" msgid="7011130656195423947">"Saznajte više"</string>

    <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Poboljšana obavještenja su zamijenila Prilagodljiva obavještenja Androida u verziji Android 12. Ova funkcija prikazuje predložene radnje i odgovore te organizira vaša obavještenja.\n\nPoboljšana obavještenja mogu pristupiti sadržaju obavještenja, uključujući lične informacije kao što su imena kontakata i poruke. Ova funkcija također može odbacivati obavještenja ili reagirati na njih, npr. može odgovarati na telefonske pozive i kontrolirati funkciju Ne ometaj."</string>

    <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Poboljšana obavještenja su zamijenila prilagodljiva obavještenja Androida u verziji Android 12. Ova funkcija prikazuje predložene radnje i odgovore te organizira vaša obavještenja.\n\nPoboljšana obavještenja mogu pristupiti sadržaju obavještenja, uključujući lične informacije kao što su imena kontakata i poruke. Ova funkcija također može odbacivati obavještenja ili reagirati na njih, npr. može odgovarati na telefonske pozive i kontrolirati funkciju Ne ometaj."</string>

    <string name="dynamic_mode_notification_channel_name" msgid="2986926422100223328">"Obavještenje za informacije Rutinskog načina"</string>

    <string name="dynamic_mode_notification_title" msgid="1388718452788985481">"Ušteda baterije je uključena"</string>

    <string name="dynamic_mode_notification_summary" msgid="1639031262484979689">"Smanjena je potrošnja baterije da se produži vijek trajanja baterije"</string>