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

Commit 0df11b5d authored by Xin Li's avatar Xin Li
Browse files

Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 

Bug: 264720040
Merged-In: I75ef387d8a3b8da1239b8ca39372a75a77435acd
Change-Id: Ie4834ea71e62cbf53da19b9b017ba4e8b957f8c2
parents c72d17fc 1c9b4252

Android.bp

+64 −69
Original line number Diff line number Diff line
@@ -19,6 +19,54 @@ package { 


min_launcher3_sdk_version = "26"



// Common source files used to build launcher (java and kotlin)

// All sources are split so they can be reused in many other libraries/apps in other folders

filegroup {

    name: "launcher-src",

    srcs: [ "src/**/*.java", "src/**/*.kt" ],

}



filegroup {

    name: "launcher-quickstep-src",

    srcs: [ "quickstep/src/**/*.java", "quickstep/src/**/*.kt" ],

}



filegroup {

    name: "launcher-go-src",

    srcs: [ "go/src/**/*.java", "go/src/**/*.kt" ],

}



filegroup {

    name: "launcher-go-quickstep-src",

    srcs: [ "go/quickstep/src/**/*.java", "go/quickstep/src/**/*.kt" ],

}



filegroup {

    name: "launcher-src_shortcuts_overrides",

    srcs: [ "src_shortcuts_overrides/**/*.java", "src_shortcuts_overrides/**/*.kt" ],

}



filegroup {

    name: "launcher-src_ui_overrides",

    srcs: [ "src_ui_overrides/**/*.java", "src_ui_overrides/**/*.kt" ],

}



filegroup {

    name: "launcher-ext_tests",

    srcs: [ "ext_tests/**/*.java", "ext_tests/**/*.kt" ],

}



filegroup {

    name: "launcher-quickstep-ext_tests",

    srcs: [ "quickstep/ext_tests/**/*.java", "quickstep/ext_tests/**/*.kt" ],

}



// Proguard files for Launcher3

filegroup {

    name: "launcher-proguard-rules",

    srcs: ["proguard.flags"],

}



android_library {

    name: "launcher-aosp-tapl",

    libs: [
@@ -105,6 +153,7 @@ android_library { 
        "androidx.cardview_cardview",

        "com.google.android.material_material",

        "iconloader_base",

        "view_capture"

    ],

    manifest: "AndroidManifest-common.xml",

    sdk_version: "current",
@@ -139,14 +188,10 @@ android_app { 
        "Launcher3CommonDepsLib",

    ],

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

        "src_shortcuts_overrides/**/*.java",

        "src_shortcuts_overrides/**/*.kt",

        "src_ui_overrides/**/*.java",

        "src_ui_overrides/**/*.kt",

        "ext_tests/src/**/*.java",

        "ext_tests/src/**/*.kt",

        ":launcher-src",

        ":launcher-src_shortcuts_overrides",

        ":launcher-src_ui_overrides",

        ":launcher-ext_tests",

    ],

    resource_dirs: [

        "ext_tests/res",
@@ -202,61 +247,14 @@ android_library { 
}





// Source code used for test helpers

filegroup {

    name: "launcher-src-ext-tests",

    srcs: [

        "ext_tests/src/**/*.java",

        "ext_tests/src/**/*.kt",

        "quickstep/ext_tests/src/**/*.java",

        "quickstep/ext_tests/src/**/*.kt",

    ],

}



// Common source files used to build launcher

filegroup {

    name: "launcher-src-no-build-config",

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

        "src_shortcuts_overrides/**/*.java",

        "src_shortcuts_overrides/**/*.kt",

        "quickstep/src/**/*.java",

        "quickstep/src/**/*.kt",

    ],

}



// Common source files used to build go launcher except go/src files

filegroup {

    name: "launcher-go-src-no-build-config",

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

        "quickstep/src/**/*.java",

        "quickstep/src/**/*.kt",

        "go/quickstep/src/**/*.java",

        "go/quickstep/src/**/*.kt",

    ],

}



// Proguard files for Launcher3

filegroup {

    name: "launcher-proguard-rules",

    srcs: ["proguard.flags"],

}



// Library with all the dependencies for building Launcher Go

android_library {

    name: "LauncherGoResLib",

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

        "quickstep/src/**/*.java",

        "quickstep/src/**/*.kt",

        "go/src/**/*.java",

        "go/src/**/*.kt",

        "go/quickstep/src/**/*.java",

        "go/quickstep/src/**/*.kt",

        ":launcher-src",

        ":launcher-quickstep-src",

        ":launcher-go-src",

        ":launcher-go-quickstep-src",

    ],

    resource_dirs: [

        "go/res",
@@ -287,7 +285,9 @@ android_library { 
android_library {

    name: "Launcher3QuickStepLib",

    srcs: [

        ":launcher-src-no-build-config",

        ":launcher-src",

        ":launcher-quickstep-src",

        ":launcher-src_shortcuts_overrides",

    ],

    resource_dirs: [],

    libs: [
@@ -319,9 +319,9 @@ android_app { 
    static_libs: ["Launcher3CommonDepsLib"],



    srcs: [

        "src/**/*.java",

        "src_ui_overrides/**/*.java",

        "go/src/**/*.java",

        ":launcher-src",

        ":launcher-go-src",

        ":launcher-src_ui_overrides",

    ],



    resource_dirs: ["go/res"],
@@ -405,12 +405,7 @@ android_app { 
    min_sdk_version: "current",

    target_sdk_version: "current",



    srcs: [

        "src/**/*.java",

        "quickstep/src/**/*.java",

        "go/src/**/*.java",

        "go/quickstep/src/**/*.java",

    ],

    srcs: [ ],



    resource_dirs: [

        "go/quickstep/res",

AndroidManifest-common.xml

+2 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
    <!-- for rotating surface by arbitrary degree -->

    <uses-permission android:name="android.permission.ROTATE_SURFACE_FLINGER" />

    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

    <uses-permission android:name="android.permission.READ_HOME_APP_SEARCH_DATA" />



    <!--

    Permissions required for read/write access to the workspace data. These permission name

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

+22 −6
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.launcher3.testing;



import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;



import android.app.Activity;

import android.app.Application;
@@ -209,12 +210,19 @@ public class DebugTestInformationHandler extends TestInformationHandler { 
            }



            case TestProtocol.REQUEST_USE_TEST_WORKSPACE_LAYOUT: {

                useTestWorkspaceLayout(true);

                useTestWorkspaceLayout(

                        LauncherSettings.Settings.ARG_DEFAULT_WORKSPACE_LAYOUT_TEST);

                return response;

            }



            case TestProtocol.REQUEST_USE_TEST2_WORKSPACE_LAYOUT: {

                useTestWorkspaceLayout(

                        LauncherSettings.Settings.ARG_DEFAULT_WORKSPACE_LAYOUT_TEST2);

                return response;

            }



            case TestProtocol.REQUEST_USE_DEFAULT_WORKSPACE_LAYOUT: {

                useTestWorkspaceLayout(false);

                useTestWorkspaceLayout(null);

                return response;

            }
@@ -248,17 +256,25 @@ public class DebugTestInformationHandler extends TestInformationHandler { 
                return response;

            }



            case TestProtocol.REQUEST_MODEL_QUEUE_CLEARED:

                return getFromExecutorSync(MODEL_EXECUTOR, Bundle::new);



            default:

                return super.call(method, arg, extras);

        }

    }



    private void useTestWorkspaceLayout(boolean useTestWorkspaceLayout) {

    private void useTestWorkspaceLayout(String layout) {

        final long identity = Binder.clearCallingIdentity();

        try {

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

                    ? LauncherSettings.Settings.METHOD_SET_USE_TEST_WORKSPACE_LAYOUT_FLAG

                    : LauncherSettings.Settings.METHOD_CLEAR_USE_TEST_WORKSPACE_LAYOUT_FLAG);

            if (layout != null) {

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

                        LauncherSettings.Settings.METHOD_SET_USE_TEST_WORKSPACE_LAYOUT_FLAG,

                        layout);

            } else {

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

                        LauncherSettings.Settings.METHOD_CLEAR_USE_TEST_WORKSPACE_LAYOUT_FLAG);

            }

        } 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-en-rCA/strings.xml

+5 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

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

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Share App"</string>

    <string name="app_share_drop_target_label" msgid="5804774105974539508">"Share app"</string>

    <string name="action_listen" msgid="2370304050784689486">"Listen"</string>

    <string name="action_translate" msgid="8028378961867277746">"Translate"</string>

    <string name="action_search" msgid="6269564710943755464">"Lens"</string>

    <string name="dialog_acknowledge" msgid="2804025517675853172">"GOT IT"</string>

    <string name="dialog_acknowledge" msgid="2804025517675853172">"OK"</string>

    <string name="dialog_cancel" msgid="6464336969134856366">"CANCEL"</string>

    <string name="dialog_settings" msgid="6564397136021186148">"SETTINGS"</string>

    <string name="niu_actions_confirmation_title" msgid="3863451714863526143">"Translate or listen to text on screen"</string>

    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses, and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>

    <string name="niu_actions_confirmation_text" msgid="2105271481950866089">"Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to "<b>"Settings &gt; Apps &gt; Default apps &gt; Digital assistant app"</b>"."</string>

    <string name="assistant_not_selected_title" msgid="5017072974603345228">"Choose an assistant to use this feature"</string>

    <string name="assistant_not_selected_text" msgid="3244613673884359276">"To listen to or translate text on your screen, choose a digital assistant app in Settings"</string>

    <string name="assistant_not_selected_text" msgid="3244613673884359276">"To listen to or translate text on your screen, choose a digital assistant app in settings"</string>

    <string name="assistant_not_supported_title" msgid="1675788067597484142">"Change your assistant to use this feature"</string>

    <string name="assistant_not_supported_text" msgid="1708031078549268884">"To listen to or translate text on your screen, change your digital assistant app in Settings"</string>

    <string name="assistant_not_supported_text" msgid="1708031078549268884">"To listen to or translate text on your screen, change your digital assistant app in settings"</string>

    <string name="tooltip_listen" msgid="7634466447860989102">"Tap here to listen to text on this screen"</string>

    <string name="tooltip_translate" msgid="4184845868901542567">"Tap here to translate text on this screen"</string>

    <string name="toast_p2p_app_not_shareable" msgid="7229739094132131536">"This app can’t be shared"</string>