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

Commit a8063bb6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Removing multidex support" into ub-launcher3-master

parents 0c324cb1 5c052b4a

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ LOCAL_USE_AAPT2 := true 
LOCAL_AAPT2_ONLY := true

LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLibLauncherWrapper launcherprotosnano

LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano

ifneq (,$(wildcard frameworks/base))

  LOCAL_PRIVATE_PLATFORM_APIS := true

else
@@ -213,7 +213,7 @@ include $(CLEAR_VARS) 
LOCAL_USE_AAPT2 := true

LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLibLauncherWrapper launcherprotosnano

LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano

ifneq (,$(wildcard frameworks/base))

  LOCAL_PRIVATE_PLATFORM_APIS := true

else

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

+1 −3
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ import com.android.quickstep.inputconsumers.OverviewInputConsumer; 
import com.android.quickstep.util.ActiveGestureLog;

import com.android.quickstep.util.AppWindowAnimationHelper.TargetAlphaProvider;

import com.android.quickstep.util.RectFSpringAnim;

import com.android.quickstep.util.SharedApiCompat;

import com.android.quickstep.util.ShelfPeekAnim;

import com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState;

import com.android.quickstep.views.LiveTileOverlay;
@@ -1142,8 +1141,7 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity> 
        final int runningTaskId = mGestureState.getRunningTaskId();

        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            if (mRecentsAnimationController != null) {

                SharedApiCompat.setWillFinishToHome(mRecentsAnimationController.getController(),

                        true /* willFinishToHome */);

                mRecentsAnimationController.getController().setWillFinishToHome(true);

                // Update the screenshot of the task

                if (mTaskSnapshot == null) {

                    mTaskSnapshot = mRecentsAnimationController.screenshotTask(runningTaskId);

quickstep/src/com/android/quickstep/SystemUiProxy.java

+1 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.util.Log; 
import android.view.MotionEvent;



import com.android.launcher3.util.MainThreadInitializedObject;

import com.android.quickstep.util.SharedApiCompat;

import com.android.systemui.shared.recents.ISystemUiProxy;



/**
@@ -278,7 +277,7 @@ public class SystemUiProxy implements ISystemUiProxy { 
            mLastShelfVisible = visible;

            mLastShelfHeight = shelfHeight;

            try {

                SharedApiCompat.setShelfHeight(mSystemUiProxy, visible, shelfHeight);

                mSystemUiProxy.setShelfHeight(visible, shelfHeight);

            } catch (RemoteException e) {

                Log.w(TAG, "Failed call setShelfHeight visible: " + visible

                        + " height: " + shelfHeight, e);