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

Commit 36b568cb authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Automerger Merge Worker
Browse files

Merge "Merging from ub-launcher3-rvc-qpr-dev @ build 6690853" into rvc-qpr-dev am: aae7f2b6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12190253

Change-Id: I5cd2a869a0d943d33c2fff554f8616dfacf7c8bc
parents b446d106 aae7f2b6

AndroidManifest-common.xml

+9 −5
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ 
    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />

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

    

    <!-- TODO(b/150802536): Enabled only for ENABLE_FIXED_ROTATION_TRANSFORM feature flag -->

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

    

    <!--

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

    should not conflict with that defined in other apps, as such an app should embed its package
@@ -86,6 +83,7 @@ 
        <receiver

            android:name="com.android.launcher3.InstallShortcutReceiver"

            android:permission="com.android.launcher.permission.INSTALL_SHORTCUT"

            android:exported="true"

            android:enabled="@bool/enable_install_shortcut_api" >

            <intent-filter>

                <action android:name="com.android.launcher.action.INSTALL_SHORTCUT" />
@@ -94,14 +92,16 @@ 


        <!-- Intent received when a session is committed -->

        <receiver

            android:name="com.android.launcher3.SessionCommitReceiver" >

            android:name="com.android.launcher3.SessionCommitReceiver"

            android:exported="true">

            <intent-filter>

                <action android:name="android.content.pm.action.SESSION_COMMITTED" />

            </intent-filter>

        </receiver>



        <!-- Intent received used to initialize a restored widget -->

        <receiver android:name="com.android.launcher3.AppWidgetsRestoredReceiver" >

        <receiver android:name="com.android.launcher3.AppWidgetsRestoredReceiver"

            android:exported="true">

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_HOST_RESTORED"/>

            </intent-filter>
@@ -117,6 +117,7 @@ 
            android:name="com.android.launcher3.notification.NotificationListener"

            android:label="@string/notification_dots_service_title"

            android:enabled="@bool/notification_dots_enabled"

            android:exported="true"

            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">

            <intent-filter>

                <action android:name="android.service.notification.NotificationListenerService" />
@@ -130,6 +131,7 @@ 
            android:theme="@style/AppItemActivityTheme"

            android:excludeFromRecents="true"

            android:autoRemoveFromRecents="true"

            android:exported="true"

            android:label="@string/action_add_to_workspace" >

            <intent-filter>

                <action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" />
@@ -165,6 +167,7 @@ 
            android:name="com.android.launcher3.settings.SettingsActivity"

            android:label="@string/settings_button_text"

            android:theme="@style/HomeSettingsTheme"

            android:exported="true"

            android:autoRemoveFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
@@ -187,6 +190,7 @@ 
            android:name="com.android.launcher3.secondarydisplay.SecondaryDisplayLauncher"

            android:theme="@style/AppTheme"

            android:launchMode="singleTop"

            android:exported="true"

            android:enabled="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
            android:resizeableActivity="true"

            android:resumeWhilePausing="true"

            android:taskAffinity=""

            android:exported="true"

            android:enabled="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

+6 −0
Original line number Diff line number Diff line
@@ -164,6 +164,12 @@ public class DebugTestInformationHandler extends TestInformationHandler { 
            }



            case TestProtocol.REQUEST_GET_TEST_EVENTS: {

                if (sEvents == null) {

                    // sEvents can be null if Launcher died and restarted after

                    // REQUEST_START_EVENT_LOGGING.

                    return response;

                }



                synchronized (sEvents) {

                    response.putStringArrayList(

                            TestProtocol.TEST_INFO_RESPONSE_FIELD, new ArrayList<>(sEvents));

protos/launcher_atom.proto

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ message Application { 
// Legacy shortcuts and shortcuts handled by ShortcutManager

message Shortcut {

  optional string shortcut_name = 1;

  optional string shortcut_id = 2;

}



// AppWidgets handled by AppWidgetManager

quickstep/AndroidManifest-launcher.xml

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
            android:resizeableActivity="true"

            android:resumeWhilePausing="true"

            android:taskAffinity=""

            android:exported="true"

            android:enabled="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />