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

Commit aa168f20 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 14 QPR1" into main

parents 0c531d5d 65e37d77

Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -153,7 +153,8 @@ android_library { 
        "androidx.cardview_cardview",

        "com.google.android.material_material",

        "iconloader_base",

        "view_capture"

        "view_capture",

        "animationlib"

    ],

    manifest: "AndroidManifest-common.xml",

    sdk_version: "current",
@@ -172,6 +173,7 @@ android_library { 
    static_libs: [

        "Launcher3ResLib",

        "launcher-testing-shared",

        "animationlib"

    ],

    sdk_version: "current",

    min_sdk_version: min_launcher3_sdk_version,

OWNERS

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ vadimt@google.com 
winsonc@google.com

jonmiranda@google.com

alexchau@google.com

patmanning@google.com

tsuharesu@google.com

awickham@google.com



per-file FeatureFlags.java, globs = set noparent

per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, captaincole@google.com

ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java

+21 −7
Original line number Diff line number Diff line
@@ -25,14 +25,13 @@ import android.content.Context; 
import android.os.Binder;

import android.os.Bundle;

import android.system.Os;

import android.util.Log;



import androidx.annotation.Keep;

import androidx.annotation.Nullable;



import com.android.launcher3.BubbleTextView;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.LauncherSettings;

import com.android.launcher3.LauncherModel;

import com.android.launcher3.ShortcutAndWidgetContainer;

import com.android.launcher3.testing.shared.TestProtocol;
@@ -62,7 +61,6 @@ public class DebugTestInformationHandler extends TestInformationHandler { 
                public void onActivityCreated(Activity activity, Bundle bundle) {

                    sActivities.put(activity, true);

                    ++sActivitiesCreatedCount;

                    Log.d(TestProtocol.FLAKY_ACTIVITY_COUNT, "onActivityCreated", new Exception());

                }



                @Override
@@ -188,13 +186,29 @@ public class DebugTestInformationHandler extends TestInformationHandler { 
                return response;

            }



            case TestProtocol.REQUEST_REINITIALIZE_DATA: {

                final long identity = Binder.clearCallingIdentity();

                try {

                    MODEL_EXECUTOR.execute(() -> {

                        LauncherModel model = LauncherAppState.getInstance(mContext).getModel();

                        model.getModelDbController().createEmptyDB();

                        MAIN_EXECUTOR.execute(model::forceReload);

                    });

                    return response;

                } finally {

                    Binder.restoreCallingIdentity(identity);

                }

            }



            case TestProtocol.REQUEST_CLEAR_DATA: {

                final long identity = Binder.clearCallingIdentity();

                try {

                    LauncherSettings.Settings.call(mContext.getContentResolver(),

                            LauncherSettings.Settings.METHOD_CREATE_EMPTY_DB);

                    MAIN_EXECUTOR.submit(() ->

                            LauncherAppState.getInstance(mContext).getModel().forceReload());

                    MODEL_EXECUTOR.execute(() -> {

                        LauncherModel model = LauncherAppState.getInstance(mContext).getModel();

                        model.getModelDbController().createEmptyDB();

                        model.getModelDbController().clearEmptyDbFlag();

                        MAIN_EXECUTOR.execute(model::forceReload);

                    });

                    return response;

                } finally {

                    Binder.restoreCallingIdentity(identity);

go/quickstep/res/values-am/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ 
    <string name="dialog_cancel" msgid="6464336969134856366">"ይቅር"</string>

    <string name="dialog_settings" msgid="6564397136021186148">"ቅንብሮች"</string>

    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"በማያ ገጹ ላይ ጽሑፍን ይተረጉሙ ወይም ያዳምጡ"</string>

    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"እንደ በማያ ገፅዎ ላይ ያለ ጽሁፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገፅ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ "<b>"ቅንብሮች &gt; መተግበሪያዎች &gt; ነባሪ መተግበሪያዎች &gt; ዲጂታል ረዳት መተግበሪያ"</b>" ይሂዱ።"</string>

    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"እንደ በማያ ገጽዎ ላይ ያለ ጽሁፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገጽ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ "<b>"ቅንብሮች &gt; መተግበሪያዎች &gt; ነባሪ መተግበሪያዎች &gt; ዲጂታል ረዳት መተግበሪያ"</b>" ይሂዱ።"</string>

    <string name="assistant_not_selected_title" msgid="5017072974603345228">"ይህንን ባህሪ ለመጠቀም ረዳት ይምረጡ"</string>

    <string name="assistant_not_selected_text" msgid="3244613673884359276">"በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያን ይምረጡ"</string>

    <string name="assistant_not_supported_title" msgid="1675788067597484142">"ይህንን ባህሪ ለመጠቀም ረዳትዎን ይቀይሩ"</string>

    <string name="assistant_not_supported_text" msgid="1708031078549268884">"በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያዎን ይቀይሩ"</string>

    <string name="tooltip_listen" msgid="7634466447860989102">"በዚህ ማያ ገፅ ላይ ጽሁፍ ለማዳመጥ እዚህ መታ ያድርጉ"</string>

    <string name="tooltip_translate" msgid="4184845868901542567">"በዚህ ማያ ገፅ ላይ ጽሁፍ ለመተርጎም እዚህ መታ ያድርጉ"</string>

    <string name="tooltip_listen" msgid="7634466447860989102">"በዚህ ማያ ገጽ ላይ ጽሁፍ ለማዳመጥ እዚህ መታ ያድርጉ"</string>

    <string name="tooltip_translate" msgid="4184845868901542567">"በዚህ ማያ ገጽ ላይ ጽሁፍ ለመተርጎም እዚህ መታ ያድርጉ"</string>

    <string name="toast_p2p_app_not_shareable" msgid="7229739094132131536">"ይህ መተግበሪያ ሊጋራ አይችልም"</string>

</resources>

go/quickstep/res/values-ky/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 
    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Экрандагы текстти которуу же угуу"</string>

    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Экрандагы текст, веб-даректер жана скриншоттор сыяктуу маалымат Google менен бөлүшүлүшү мүмкүн.\n\nБөлүшүлгөн маалыматты өзгөртүү үчүн"<b>"Параметрлер &gt; Колдонмолор &gt; Демейки колдонмолор &gt; Санариптик жардамчы колдонмосуна өтүңүз"</b>"."</string>

    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Бул функцияны колдонуу үчүн жардамчыны тандаңыз"</string>

    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Экраныңыздагы текстти угуу же которуу үчүн Параметрлерден санариптик жардамчы колдонмосун тандаңыз"</string>

    <string name="assistant_not_selected_text" msgid="3244613673884359276">"Экраныңыздагы текстти угуу же которуу үчүн Жөндөөлөрдөн санариптик жардамчы колдонмосун тандаңыз"</string>

    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Бул функцияны колдонуу үчүн жардамчыңызды өзгөртүңүз"</string>

    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Экраныңыздагы текстти угуу же которуу үчүн Параметрлерден санариптик жардамчы колдонмосун өзгөртүңүз"</string>

    <string name="assistant_not_supported_text" msgid="1708031078549268884">"Экраныңыздагы текстти угуу же которуу үчүн Жөндөөлөрдөн санариптик жардамчы колдонмосун өзгөртүңүз"</string>

    <string name="tooltip_listen" msgid="7634466447860989102">"Бул экрандагы текстти угуу үчүн бул жерди басыңыз"</string>

    <string name="tooltip_translate" msgid="4184845868901542567">"Бул экрандагы текстти которуу үчүн бул жерди басыңыз"</string>

    <string name="toast_p2p_app_not_shareable" msgid="7229739094132131536">"Бул колдонмону бөлүшүүгө болбойт"</string>