PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 8167364 from 6992855742 to tm-release

Browse Source 
Change-Id: I40be4d15207b843ed71cf670aaf8ecfc9b43a330
This commit is contained in:
Android Build Coastguard Worker
2022-02-10 02:10:01 +00:00
parent 562f62436c 6992855742
commit 52c88ac3b5
9 changed files with 173 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AndroidManifest.xml
+1
View File
@@ -58,6 +58,7 @@
android:enabled="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.SHOW_WORK_APPS" />
<category android:name="android.intent.category.HOME" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.MONKEY"/>
quickstep/src/com/android/launcher3/model/AppEventProducer.java
+3 -3
View File
@@ -138,12 +138,12 @@ public class AppEventProducer implements StatsLogConsumer {
if (mLastDragItem == null) {
return;
}
if (isTrackedForHotseatPrediction(atomInfo)) {
sendEvent(atomInfo, ACTION_PIN, CONTAINER_HOTSEAT_PREDICTION);
}
if (isTrackedForHotseatPrediction(mLastDragItem)) {
sendEvent(mLastDragItem, ACTION_UNPIN, CONTAINER_HOTSEAT_PREDICTION);
}
if (isTrackedForHotseatPrediction(atomInfo)) {
sendEvent(atomInfo, ACTION_PIN, CONTAINER_HOTSEAT_PREDICTION);
}
if (isTrackedForWidgetPrediction(atomInfo)) {
sendEvent(atomInfo, ACTION_PIN, CONTAINER_WIDGETS_PREDICTION);
}
quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
+117 -4
View File
@@ -15,6 +15,11 @@
*/
package com.android.launcher3.taskbar;
import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
import android.content.ClipData;
import android.content.ClipDescription;
import android.content.Intent;
@@ -27,7 +32,9 @@ import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.view.DragEvent;
import android.view.MotionEvent;
import android.view.SurfaceControl;
import android.view.View;
import android.view.ViewRootImpl;
import androidx.annotation.Nullable;
@@ -39,20 +46,25 @@ import com.android.launcher3.DragSource;
import com.android.launcher3.DropTarget;
import com.android.launcher3.LauncherSettings;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.accessibility.DragViewStateAnnouncer;
import com.android.launcher3.anim.Interpolators;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.dragndrop.DragController;
import com.android.launcher3.dragndrop.DragDriver;
import com.android.launcher3.dragndrop.DragOptions;
import com.android.launcher3.dragndrop.DragView;
import com.android.launcher3.dragndrop.DraggableView;
import com.android.launcher3.folder.FolderIcon;
import com.android.launcher3.graphics.DragPreviewProvider;
import com.android.launcher3.logging.StatsLogManager;
import com.android.launcher3.model.data.FolderInfo;
import com.android.launcher3.model.data.ItemInfo;
import com.android.launcher3.model.data.WorkspaceItemInfo;
import com.android.launcher3.popup.PopupContainerWithArrow;
import com.android.launcher3.shortcuts.DeepShortcutView;
import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
import com.android.launcher3.util.LauncherBindableItemsContainer;
import com.android.systemui.shared.recents.model.Task;
import com.android.systemui.shared.system.ClipDescriptionCompat;
import com.android.systemui.shared.system.LauncherAppsCompat;
@@ -66,6 +78,8 @@ import java.util.Arrays;
public class TaskbarDragController extends DragController<TaskbarActivityContext> implements
TaskbarControllers.LoggableTaskbarController {
private static boolean DEBUG_DRAG_SHADOW_SURFACE = false;
private final int mDragIconSize;
private final int[] mTempXY = new int[2];
@@ -78,6 +92,9 @@ public class TaskbarDragController extends DragController<TaskbarActivityContext
private boolean mIsSystemDragInProgress;
// Animation for the drag shadow back into position after an unsuccessful drag
private ValueAnimator mReturnAnimator;
public TaskbarDragController(TaskbarActivityContext activity) {
super(activity);
Resources resources = mActivity.getResources();
@@ -279,6 +296,9 @@ public class TaskbarDragController extends DragController<TaskbarActivityContext
@Override
public void onDrawShadow(Canvas canvas) {
canvas.save();
if (DEBUG_DRAG_SHADOW_SURFACE) {
canvas.drawColor(0xffff0000);
}
float scale = mDragObject.dragView.getScaleX();
canvas.scale(scale, scale);
mDragObject.dragView.draw(canvas);
@@ -337,8 +357,9 @@ public class TaskbarDragController extends DragController<TaskbarActivityContext
ClipData clipData = new ClipData(clipDescription, new ClipData.Item(intent));
if (btv.startDragAndDrop(clipData, shadowBuilder, null /* localState */,
View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_OPAQUE)) {
onSystemDragStarted();
View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_OPAQUE
| View.DRAG_FLAG_REQUEST_SURFACE_FOR_RETURN_ANIMATION)) {
onSystemDragStarted(btv);
mActivity.getStatsLogManager().logger().withItemInfo(mDragObject.dragInfo)
.withInstanceId(launcherInstanceId)
@@ -347,7 +368,7 @@ public class TaskbarDragController extends DragController<TaskbarActivityContext
}
}
private void onSystemDragStarted() {
private void onSystemDragStarted(BubbleTextView btv) {
mIsSystemDragInProgress = true;
mActivity.getDragLayer().setOnDragListener((view, dragEvent) -> {
switch (dragEvent.getAction()) {
@@ -356,7 +377,12 @@ public class TaskbarDragController extends DragController<TaskbarActivityContext
return true;
case DragEvent.ACTION_DRAG_ENDED:
mIsSystemDragInProgress = false;
maybeOnDragEnd();
if (dragEvent.getResult()) {
maybeOnDragEnd();
} else {
// This will take care of calling maybeOnDragEnd() after the animation
animateGlobalDragViewToOriginalPosition(btv, dragEvent);
}
return true;
}
return false;
@@ -382,6 +408,93 @@ public class TaskbarDragController extends DragController<TaskbarActivityContext
maybeOnDragEnd();
}
private void animateGlobalDragViewToOriginalPosition(BubbleTextView btv,
DragEvent dragEvent) {
SurfaceControl dragSurface = dragEvent.getDragSurface();
// For top level icons, the target is the icon itself
View target = btv;
Object tag = btv.getTag();
if (tag instanceof ItemInfo) {
ItemInfo item = (ItemInfo) tag;
TaskbarViewController taskbarViewController = mControllers.taskbarViewController;
if (item.container == CONTAINER_ALL_APPS) {
// Since all apps closes when the drag starts, target the all apps button instead
target = taskbarViewController.getAllAppsButtonView();
} else if (item.container >= 0) {
// Since folders close when the drag starts, target the folder icon instead
LauncherBindableItemsContainer.ItemOperator op = (info, v) -> {
if (info instanceof FolderInfo && v instanceof FolderIcon) {
FolderInfo fi = (FolderInfo) info;
for (WorkspaceItemInfo si : fi.contents) {
if (si.id == item.id) {
// Found the parent
return true;
}
}
}
return false;
};
target = taskbarViewController.mapOverItems(op);
}
}
// Finish any pending return animation before starting a new drag
if (mReturnAnimator != null) {
mReturnAnimator.end();
}
float fromX = dragEvent.getX() - dragEvent.getOffsetX();
float fromY = dragEvent.getY() - dragEvent.getOffsetY();
int[] toPosition = target.getLocationOnScreen();
float toScale = (float) target.getWidth() / mDragIconSize;
float toAlpha = (target == btv) ? 1f : 0f;
final ViewRootImpl viewRoot = target.getViewRootImpl();
SurfaceControl.Transaction tx = new SurfaceControl.Transaction();
mReturnAnimator = ValueAnimator.ofFloat(0f, 1f);
mReturnAnimator.setDuration(300);
mReturnAnimator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
mReturnAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
float t = animation.getAnimatedFraction();
float accelT = Interpolators.ACCEL_2.getInterpolation(t);
float scale = 1f - t * (1f - toScale);
float alpha = 1f - accelT * (1f - toAlpha);
tx.setPosition(dragSurface, Utilities.mapRange(t, fromX, toPosition[0]),
Utilities.mapRange(t, fromY, toPosition[1]));
tx.setScale(dragSurface, scale, scale);
tx.setAlpha(dragSurface, alpha);
tx.apply();
}
});
mReturnAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationCancel(Animator animation) {
cleanUpSurface();
}
@Override
public void onAnimationEnd(Animator animation) {
cleanUpSurface();
}
private void cleanUpSurface() {
maybeOnDragEnd();
// Synchronize removing the drag surface with the next draw after calling
// maybeOnDragEnd()
viewRoot.consumeNextDraw((transaction) -> {
transaction.remove(dragSurface);
transaction.apply();
tx.close();
});
viewRoot.getView().invalidate();
mReturnAnimator = null;
}
});
mReturnAnimator.start();
}
@Override
protected float getX(MotionEvent ev) {
// We will resize to fill the screen while dragging, so use screen coordinates. This ensures
quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+17 -3
View File
@@ -32,6 +32,7 @@ import androidx.annotation.Nullable;
import com.android.launcher3.BubbleTextView;
import com.android.launcher3.Insettable;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.folder.FolderIcon;
import com.android.launcher3.model.data.FolderInfo;
@@ -214,7 +215,8 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
}
if (mAllAppsButton != null) {
addView(mAllAppsButton);
int index = Utilities.isRtl(getResources()) ? 0 : getChildCount();
addView(mAllAppsButton, index);
}
}
@@ -316,6 +318,13 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
return icons;
}
/**
* Returns the all apps button in the taskbar.
*/
public View getAllAppsButtonView() {
return mAllAppsButton;
}
// FolderIconParent implemented methods.
@Override
@@ -357,13 +366,18 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
return getVisibility() == VISIBLE;
}
protected void mapOverItems(LauncherBindableItemsContainer.ItemOperator op) {
/**
* Maps {@code op} over all the child views, returning the view that {@code op} evaluates
* {@code true} for, or {@code null} if none satisfy {@code op}.
*/
protected View mapOverItems(LauncherBindableItemsContainer.ItemOperator op) {
// map over all the shortcuts on the taskbar
for (int i = 0; i < getChildCount(); i++) {
View item = getChildAt(i);
if (op.evaluate((ItemInfo) item.getTag(), item)) {
return;
return item;
}
}
return null;
}
}
quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
+9 -3
View File
@@ -164,6 +164,10 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
return mTaskbarView.getIconViews();
}
public View getAllAppsButtonView() {
return mTaskbarView.getAllAppsButtonView();
}
public AnimatedFloat getTaskbarIconScaleForStash() {
return mTaskbarIconScaleForStash;
}
@@ -235,7 +239,9 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
if (FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get() && i == count - 1) {
// Note that there is no All Apps button in the hotseat, this position is only used
// as its convenient for animation purposes.
positionInHotseat = mActivity.getDeviceProfile().inv.numShownHotseatIcons;
positionInHotseat = Utilities.isRtl(child.getResources())
? -1
: mActivity.getDeviceProfile().inv.numShownHotseatIcons;
setter.setViewAlpha(child, 0, LINEAR);
} else if (child.getTag() instanceof ItemInfo) {
@@ -268,8 +274,8 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
mTaskbarNavButtonTranslationY.updateValue(-deviceProfile.getTaskbarOffsetY());
}
public void mapOverItems(LauncherBindableItemsContainer.ItemOperator op) {
mTaskbarView.mapOverItems(op);
public View mapOverItems(LauncherBindableItemsContainer.ItemOperator op) {
return mTaskbarView.mapOverItems(op);
}
/**
quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+2 -2
View File
@@ -1198,10 +1198,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
// We probably never received an animation controller, skip logging.
return;
}
int pageIndex = endTarget == LAST_TASK
int pageIndex = endTarget == LAST_TASK || mRecentsView == null
? LOG_NO_OP_PAGE_INDEX
: mRecentsView.getNextPage();
// TODO: set correct container using the pageIndex
logger.withRank(pageIndex);
logger.log(event);
}
src/com/android/launcher3/Launcher.java
+9
View File
@@ -125,6 +125,7 @@ import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
import com.android.launcher3.allapps.ActivityAllAppsContainerView;
import com.android.launcher3.allapps.AllAppsStore;
import com.android.launcher3.allapps.AllAppsTransitionController;
import com.android.launcher3.allapps.BaseAllAppsContainerView;
import com.android.launcher3.allapps.DiscoveryBounce;
import com.android.launcher3.anim.AnimatorListeners;
import com.android.launcher3.anim.PropertyListBuilder;
@@ -1579,6 +1580,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
boolean isActionMain = Intent.ACTION_MAIN.equals(intent.getAction());
boolean internalStateHandled = ACTIVITY_TRACKER.handleNewIntent(this);
hideKeyboard();
if (isActionMain) {
if (!internalStateHandled) {
// In all these cases, only animate if we're already on home
@@ -1607,6 +1609,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
handleGestureContract(intent);
} else if (Intent.ACTION_ALL_APPS.equals(intent.getAction())) {
showAllAppsFromIntent(alreadyOnHome);
} else if (Intent.ACTION_SHOW_WORK_APPS.equals(intent.getAction())) {
showAllAppsWorkTabFromIntent(alreadyOnHome);
}
TraceHelper.INSTANCE.endSection(traceToken);
@@ -1617,6 +1621,11 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
getStateManager().goToState(ALL_APPS, alreadyOnHome);
}
private void showAllAppsWorkTabFromIntent(boolean alreadyOnHome) {
showAllAppsFromIntent(alreadyOnHome);
mAppsView.switchToTab(BaseAllAppsContainerView.AdapterHolder.WORK);
}
/**
* Handles gesture nav contract
*/
src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
+10
View File
@@ -331,6 +331,16 @@ public abstract class BaseAllAppsContainerView<T extends Context & ActivityConte
return mViewPager.getNextPage() == 0;
}
/**
* Switches the current page to the provided {@code tab} if tabs are supported, otherwise does
* nothing.
*/
public void switchToTab(int tab) {
if (mUsingTabs) {
mViewPager.setCurrentPage(tab);
}
}
public LayoutInflater getLayoutInflater() {
return LayoutInflater.from(getContext());
}
src/com/android/launcher3/folder/FolderNameProvider.java
+5 -1
View File
@@ -27,12 +27,14 @@ import com.android.launcher3.R;
import com.android.launcher3.model.AllAppsList;
import com.android.launcher3.model.BaseModelUpdateTask;
import com.android.launcher3.model.BgDataModel;
import com.android.launcher3.model.StringCache;
import com.android.launcher3.model.data.AppInfo;
import com.android.launcher3.model.data.FolderInfo;
import com.android.launcher3.model.data.WorkspaceItemInfo;
import com.android.launcher3.util.IntSparseArrayMap;
import com.android.launcher3.util.Preconditions;
import com.android.launcher3.util.ResourceBasedOverride;
import com.android.launcher3.views.ActivityContext;
import java.util.ArrayList;
import java.util.Arrays;
@@ -107,7 +109,9 @@ public class FolderNameProvider implements ResourceBasedOverride {
Set<UserHandle> users = workspaceItemInfos.stream().map(w -> w.user)
.collect(Collectors.toSet());
if (users.size() == 1 && !users.contains(Process.myUserHandle())) {
String workFolderName = context.getString(R.string.work_folder_name);
StringCache cache = ActivityContext.lookupContext(context).getStringCache();
String workFolderName = cache != null
? cache.workFolderName : context.getString(R.string.work_folder_name);
setAsLastSuggestion(nameInfos, workFolderName);
}