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

Commit 7947484c authored by Jon's avatar Jon Committed by android-build-merger
Browse files

Merge branch 'ub-launcher3-master' into pi-dev am: 3f7df53d 

am: cca5cd02

Change-Id: I3b7f4fcabcd2300fa2a5a9e4f9caea9341935913
parents 0af5f190 cca5cd02

AndroidManifest-common.xml

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

            android:process=":wallpaper_chooser"

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

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





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

        <service

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

            android:label="@string/icon_badging_service_title"

            android:enabled="@bool/notification_badging_enabled"

            android:enabled="@bool/notification_badging_enabled"

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

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

            <intent-filter>

            <intent-filter>

AndroidManifest.xml

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

            android:clearTaskOnLaunch="true"

            android:stateNotNeeded="true"

            android:stateNotNeeded="true"

            android:windowSoftInputMode="adjustPan"

            android:windowSoftInputMode="adjustPan"

            android:screenOrientation="nosensor"

            android:screenOrientation="unspecified"

            android:configChanges="keyboard|keyboardHidden|navigation"

            android:configChanges="keyboard|keyboardHidden|navigation"

            android:resizeableActivity="true"

            android:resizeableActivity="true"

            android:resumeWhilePausing="true"

            android:resumeWhilePausing="true"

proguard.flags

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

    public <init>(...);

}

}





# InstantAppResolver

-keep class com.android.quickstep.InstantAppResolverImpl {

    public <init>(...);

}



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

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

  *;

  *;

}

}

quickstep/AndroidManifest.xml

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

        android:restoreAnyVersion="true"

        android:supportsRtl="true" >

        android:supportsRtl="true" >





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

        <service

            android:exported="true" />

            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>





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

        <!-- 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 -->

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

quickstep/libs/sysui_shared.jar

+1.72 KiB (115 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file