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

Commit 6cf6dd8b authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Jon
Browse files

Revert "Merge branch 'ub-launcher3-master' into pi-dev" 

Original CL loses the commit history. I believe this is due to doing the merge on master and cherry picking to pi-dev. Tested locally that reverting this results in no conflicts when doing the merge properly on pi-dev.

This reverts commit 3f7df53d.

Bug: 74794600
Test: manual test
Change-Id: I58f3bb1bd5ce789be380bac9716efd2627a90f92
parent 3f7df53d

AndroidManifest-common.xml

+3 −5
Original line number Diff line number Diff line
@@ -87,9 +87,7 @@ 
            android:process=":wallpaper_chooser"

            android:permission="android.permission.BIND_JOB_SERVICE" />



        <service

            android:name="com.android.launcher3.notification.NotificationListener"

            android:label="@string/icon_badging_service_title"

        <service android:name="com.android.launcher3.notification.NotificationListener"

                 android:enabled="@bool/notification_badging_enabled"

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

            <intent-filter>

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
            android:clearTaskOnLaunch="true"

            android:stateNotNeeded="true"

            android:windowSoftInputMode="adjustPan"

            android:screenOrientation="unspecified"

            android:screenOrientation="nosensor"

            android:configChanges="keyboard|keyboardHidden|navigation"

            android:resizeableActivity="true"

            android:resumeWhilePausing="true"

proguard.flags

+0 −5
Original line number Diff line number Diff line
@@ -102,11 +102,6 @@ 
    public <init>(...);

}



# InstantAppResolver

-keep class com.android.quickstep.InstantAppResolverImpl {

    public <init>(...);

}



-keep interface com.android.launcher3.userevent.nano.LauncherLogProto.** {

  *;

}

quickstep/AndroidManifest.xml

+2 −7
Original line number Diff line number Diff line
@@ -36,13 +36,8 @@ 
        android:restoreAnyVersion="true"

        android:supportsRtl="true" >



        <service

            android:name="com.android.quickstep.TouchInteractionService"

            android:permission="android.permission.STATUS_BAR_SERVICE" >

            <intent-filter>

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

            </intent-filter>

        </service>

        <service android:name="com.android.quickstep.TouchInteractionService"

            android:exported="true" />



        <!-- STOPSHIP: Change exported to false once all the integration is complete.

        It is set to true so that the activity can be started from command line -->

quickstep/libs/sysui_shared.jar

−1.72 KiB (114 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file