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

Commit 7f3333d1 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5443223 from 01aea983 to qt-release

Change-Id: I2cb7d9f0d52f5ca9a438cccacdcc8eecf149debc
parents 070b9f05 01aea983
Loading
Loading
Loading
Loading
+5 −10
Original line number Diff line number Diff line
@@ -16,15 +16,6 @@

LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)
LOCAL_MODULE := libPluginCore
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_SRC_FILES := libs/plugin_core.jar
LOCAL_UNINSTALLABLE_MODULE := true
LOCAL_SDK_VERSION := current
include $(BUILD_PREBUILT)

#
# Build rule for plugin lib (needed to write a plugin).
#
@@ -33,7 +24,11 @@ LOCAL_USE_AAPT2 := true
LOCAL_AAPT2_ONLY := true
LOCAL_MODULE_TAGS := optional

ifneq (,$(wildcard frameworks/base))
    LOCAL_STATIC_JAVA_LIBRARIES:= PluginCoreLib
else
    LOCAL_STATIC_JAVA_LIBRARIES:= libPluginCore
endif

LOCAL_SRC_FILES := \
    $(call all-java-files-under, src_plugins)

libs/plugin_core.jar

deleted100644 → 0
−4.94 KiB

File deleted.

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public abstract class RecentsUiFactory {
    private static final float RECENTS_PREPARE_SCALE = 1.33f;

    public static TouchController[] createTouchControllers(Launcher launcher) {
        Mode mode = SysUINavigationMode.INSTANCE.get(launcher).getMode();
        Mode mode = SysUINavigationMode.getMode(launcher);

        ArrayList<TouchController> list = new ArrayList<>();
        list.add(launcher.getDragController());
@@ -106,7 +106,7 @@ public abstract class RecentsUiFactory {
     * @param launcher the launcher activity
     */
    public static void prepareToShowOverview(Launcher launcher) {
        if (FeatureFlags.SWIPE_HOME.get()) {
        if (SysUINavigationMode.getMode(launcher) == Mode.NO_BUTTON) {
            // Overview lives on the side, so doesn't scale in from above.
            return;
        }
+3 −2
Original line number Diff line number Diff line
@@ -20,8 +20,9 @@ import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
import android.os.RemoteException;
import com.android.launcher3.Launcher;
import com.android.launcher3.allapps.AllAppsTransitionController;
import com.android.launcher3.config.FeatureFlags;
import com.android.quickstep.RecentsModel;
import com.android.quickstep.SysUINavigationMode;
import com.android.quickstep.SysUINavigationMode.Mode;
import com.android.quickstep.util.LayoutUtils;
import com.android.quickstep.views.RecentsView;
import com.android.systemui.shared.recents.ISystemUiProxy;
@@ -76,7 +77,7 @@ public class BackgroundAppState extends OverviewState {

    @Override
    public int getVisibleElements(Launcher launcher) {
        if (FeatureFlags.SWIPE_HOME.get()) {
        if (SysUINavigationMode.getMode(launcher) == Mode.NO_BUTTON) {
            return super.getVisibleElements(launcher);
        }
        // Hide shelf content (e.g. QSB) because we fade it in when swiping up.
+3 −2
Original line number Diff line number Diff line
@@ -36,11 +36,12 @@ import com.android.launcher3.LauncherState;
import com.android.launcher3.LauncherStateManager;
import com.android.launcher3.Utilities;
import com.android.launcher3.anim.AnimatorSetBuilder;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.touch.AbstractStateChangeTouchController;
import com.android.launcher3.touch.SwipeDetector;
import com.android.launcher3.userevent.nano.LauncherLogProto;
import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
import com.android.quickstep.SysUINavigationMode;
import com.android.quickstep.SysUINavigationMode.Mode;
import com.android.quickstep.views.RecentsView;
import com.android.quickstep.views.TaskView;

@@ -105,7 +106,7 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
    private void setupInterpolators(AnimatorSetBuilder animatorSetBuilder) {
        animatorSetBuilder.setInterpolator(ANIM_WORKSPACE_FADE, DEACCEL_2);
        animatorSetBuilder.setInterpolator(ANIM_ALL_APPS_FADE, DEACCEL_2);
        if (FeatureFlags.SWIPE_HOME.get()) {
        if (SysUINavigationMode.getMode(mLauncher) == Mode.NO_BUTTON) {
            // Overview lives to the left of workspace, so translate down later than over
            animatorSetBuilder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL_2);
            animatorSetBuilder.setInterpolator(ANIM_VERTICAL_PROGRESS, ACCEL_2);
Loading