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

Commit 73b84ce4 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Merging from ub-launcher3-master @ build 6018909 

Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-master_6018909.html

Change-Id: I8a1e20d0b175f03a1a05c81749f07ab5314e872a
parents a45552c0 8bdd83ec

Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ LOCAL_RESOURCE_DIR := \ 
    $(LOCAL_PATH)/quickstep/recents_ui_overrides/res



LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/AndroidManifest.xml \

    $(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \

    $(LOCAL_PATH)/AndroidManifest-common.xml



LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
@@ -247,7 +247,7 @@ LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3 


LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/go/AndroidManifest.xml \

    $(LOCAL_PATH)/AndroidManifest.xml \

    $(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \

    $(LOCAL_PATH)/AndroidManifest-common.xml



LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
@@ -293,7 +293,7 @@ LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3 


LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/go/AndroidManifest.xml \

    $(LOCAL_PATH)/AndroidManifest.xml \

    $(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \

    $(LOCAL_PATH)/AndroidManifest-common.xml



LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml

AndroidManifest-common.xml

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ 
        <activity

            android:name="com.android.launcher3.settings.SettingsActivity"

            android:label="@string/settings_button_text"

            android:theme="@android:style/Theme.DeviceDefault.Settings"

            android:theme="@style/HomeSettingsTheme"

            android:autoRemoveFromRecents="true">

            <intent-filter>

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

OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ mrcasey@google.com 
sunnygoyal@google.com

twickham@google.com

winsonc@google.com

zakcohen@google.com



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

per-file BaseFlags.java = sunnygoyal@google.com, adamcohen@google.com

go/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    xmlns:tools="http://schemas.android.com/tools"

    package="com.android.launcher3" >



    <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="25"/>

    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>



    <application

        android:backupAgent="com.android.launcher3.LauncherBackupAgent"

go/quickstep/res/values/override.xml

+2 −0
Original line number Diff line number Diff line
@@ -22,5 +22,7 @@ 
  <string name="instant_app_resolver_class" translatable="false">com.android.quickstep.InstantAppResolverImpl</string>



  <string name="main_process_initializer_class" translatable="false">com.android.quickstep.QuickstepProcessInitializer</string>



  <string name="user_event_dispatcher_class" translatable="false">com.android.quickstep.logging.UserEventDispatcherExtension</string>

</resources>