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

Commit bf290232 authored by Jon's avatar Jon
Browse files

Merge branch 'ub-launcher3-edmonton' into pi-dev 

Bug: 80134723
Test: manual
Change-Id: If8e9c1b1aacf547ab7a1edaccaa9fed5e976a980
parents aea65680 f4392dbf

proguard.flags

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

}



# UserEventDispatcherExtension

-keep class com.android.quickstep.logging.UserEventDispatcherExtension {

    public <init>(...);

}



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

  *;

}

protos/launcher_log.proto

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ enum ControlType { 
  QUICK_SCRUB_BUTTON = 12;

  CLEAR_ALL_BUTTON = 13;

  CANCEL_TARGET = 14;

  TASK_PREVIEW = 15;

  SPLIT_SCREEN_TARGET = 16;

}



enum TipType {

quickstep/res/layout/fallback_recents_activity.xml

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
        android:id="@+id/overview_panel_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:clipChildren="false"

    >

        <include layout="@layout/overview_clear_all_button"/>
@@ -33,6 +34,7 @@ 
            android:layout_height="match_parent"

            android:clipChildren="false"

            android:clipToPadding="false"

            android:outlineProvider="none"

            android:focusableInTouchMode="true"

            android:theme="@style/HomeScreenElementTheme"

        >

quickstep/res/layout/overview_panel.xml

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

    android:visibility="invisible"

>

    <include layout="@layout/overview_clear_all_button"/>
@@ -28,6 +29,7 @@ 
        android:layout_height="match_parent"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:outlineProvider="none"

        android:focusableInTouchMode="true"

        android:accessibilityPaneTitle="@string/accessibility_recent_apps"

        android:theme="@style/HomeScreenElementTheme"

quickstep/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 


    <string name="overview_callbacks_class" translatable="false"></string>



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

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

</resources>