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

Commit b8e78bf4 authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Merging from ub-launcher3-master @ build 6094789 

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

Change-Id: Iebd789eadfae2930807cc28373c2e1765f70e481
parents 2442a351 800aaa0d

proguard.flags

+5 −2
Original line number Diff line number Diff line
@@ -23,7 +23,10 @@ 
# support jar.

-keep class androidx.recyclerview.widget.RecyclerView { *; }



# Preference fragments

# Fragments

-keep class ** extends androidx.fragment.app.Fragment {

    public <init>(...);

}

-keep class ** extends android.app.Fragment {

    public <init>(...);

}

protos/launcher_log.proto

+2 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ message Target { 
  optional TargetExtension extension = 16;

  optional TipType tip_type = 17;

  optional int32 search_query_length = 18;

  optional bool is_work_app = 19;

}



// Used to define what type of item a Target would represent.
@@ -92,7 +93,7 @@ enum ContainerType { 
  TASKSWITCHER = 12; // Recents UI Container (QuickStep)

  APP = 13; // Foreground activity is another app (QuickStep)

  TIP = 14; // Onboarding texts (QuickStep)

  SIDELOADED_LAUNCHER = 15;

  OTHER_LAUNCHER_APP = 15;

}



// Used to define what type of control a Target would represent.

quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ public final class FallbackActivityInterface implements 
        RecentsActivity activity = getCreatedActivity();

        boolean visible = activity != null && activity.isStarted() && activity.hasWindowFocus();

        return visible

                ? LauncherLogProto.ContainerType.SIDELOADED_LAUNCHER

                ? LauncherLogProto.ContainerType.OTHER_LAUNCHER_APP

                : LauncherLogProto.ContainerType.APP;

    }

quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java

+3 −1
Original line number Diff line number Diff line
@@ -453,8 +453,10 @@ public class FallbackSwipeHandler extends BaseSwipeUpHandler<RecentsActivity, Fa 


    @Override

    public void onRecentsAnimationCanceled(ThumbnailData thumbnailData) {

        super.onRecentsAnimationCanceled(thumbnailData);

        mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);



        // Defer clearing the controller and the targets until after we've updated the state

        super.onRecentsAnimationCanceled(thumbnailData);

    }



    /**

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java

+4 −2
Original line number Diff line number Diff line
@@ -610,10 +610,12 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity> 


    @Override

    public void onRecentsAnimationCanceled(ThumbnailData thumbnailData) {

        super.onRecentsAnimationCanceled(thumbnailData);

        ActiveGestureLog.INSTANCE.addLog("cancelRecentsAnimation");

        mActivityInitListener.unregister();

        mStateCallback.setStateOnUiThread(STATE_GESTURE_CANCELLED | STATE_HANDLER_INVALIDATED);

        ActiveGestureLog.INSTANCE.addLog("cancelRecentsAnimation");



        // Defer clearing the controller and the targets until after we've updated the state

        super.onRecentsAnimationCanceled(thumbnailData);

    }



    @Override