Snap for 7202308 from 7f7d0a540c to tm-release
Change-Id: Iad775ad9f311d7bff4338be18ea7c05cb1e0538e
This commit is contained in:
commit
90ef86b205
51 files changed
+1194
-524
No files matched your search
@@ -4,6 +4,13 @@
|
||||
# People who can approve changes for submission
|
||||
#
|
||||
|
||||
petrcermak@google.com
|
||||
pbdr@google.com
|
||||
kideckel@google.com
|
||||
stevenckng@google.com
|
||||
ydixit@google.com
|
||||
boadway@google.com
|
||||
alinazaidi@google.com
|
||||
adamcohen@google.com
|
||||
hyunyoungs@google.com
|
||||
mrcasey@google.com
|
||||
|
||||
@@ -14,25 +14,7 @@
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:gravity="bottom">
|
||||
<!-- Shadow -->
|
||||
<shape>
|
||||
<gradient android:angle="270"
|
||||
android:endColor="@android:color/transparent"
|
||||
android:startColor="#26000000" />
|
||||
<size android:height="@dimen/task_card_menu_shadow_height" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:bottom="@dimen/task_card_menu_shadow_height">
|
||||
<!-- Background -->
|
||||
<shape>
|
||||
<corners
|
||||
android:topLeftRadius="?android:attr/dialogCornerRadius"
|
||||
android:topRightRadius="?android:attr/dialogCornerRadius"
|
||||
android:bottomLeftRadius="0dp"
|
||||
android:bottomRightRadius="0dp" />
|
||||
<solid android:color="?attr/popupColorPrimary" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="?attr/popupColorPrimary" />
|
||||
</shape>
|
||||
@@ -17,8 +17,6 @@
|
||||
<!-- Class overrides for launcher with quickstep. -->
|
||||
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="app_transition_manager_class" translatable="false">com.android.launcher3.LauncherAppTransitionManagerImpl</string>
|
||||
|
||||
<string name="instant_app_resolver_class" translatable="false">com.android.quickstep.InstantAppResolverImpl</string>
|
||||
|
||||
<string name="app_launch_tracker_class" translatable="false">com.android.launcher3.appprediction.PredictionAppTracker</string>
|
||||
|
||||
@@ -25,7 +25,6 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY
|
||||
|
||||
import android.animation.AnimatorSet;
|
||||
import android.animation.ValueAnimator;
|
||||
import android.app.ActivityOptions;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentSender;
|
||||
import android.os.Bundle;
|
||||
@@ -47,6 +46,7 @@ import com.android.launcher3.taskbar.TaskbarActivityContext;
|
||||
import com.android.launcher3.taskbar.TaskbarController;
|
||||
import com.android.launcher3.taskbar.TaskbarStateHandler;
|
||||
import com.android.launcher3.uioverrides.RecentsViewStateController;
|
||||
import com.android.launcher3.util.ActivityOptionsWrapper;
|
||||
import com.android.launcher3.util.DisplayController;
|
||||
import com.android.launcher3.util.UiThreadHelper;
|
||||
import com.android.quickstep.RecentsModel;
|
||||
@@ -73,6 +73,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
|
||||
implements NavigationModeChangeListener {
|
||||
|
||||
private DepthController mDepthController = new DepthController(this);
|
||||
private QuickstepTransitionManager mAppTransitionManager;
|
||||
|
||||
/**
|
||||
* Reusable command for applying the back button alpha on the background thread.
|
||||
@@ -91,6 +92,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
mAppTransitionManager = new QuickstepTransitionManager(this);
|
||||
mAppTransitionManager.registerRemoteAnimations();
|
||||
|
||||
SysUINavigationMode.INSTANCE.get(this).addModeChangeListener(this);
|
||||
addMultiWindowModeChangedListener(mDepthController);
|
||||
@@ -98,8 +101,9 @@ public abstract class BaseQuickstepLauncher extends Launcher
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
SysUINavigationMode.INSTANCE.get(this).removeModeChangeListener(this);
|
||||
mAppTransitionManager.onActivityDestroyed();
|
||||
|
||||
SysUINavigationMode.INSTANCE.get(this).removeModeChangeListener(this);
|
||||
if (mTaskbarController != null) {
|
||||
mTaskbarController.cleanup();
|
||||
}
|
||||
@@ -107,6 +111,10 @@ public abstract class BaseQuickstepLauncher extends Launcher
|
||||
super.onDestroy();
|
||||
}
|
||||
|
||||
public QuickstepTransitionManager getAppTransitionManager() {
|
||||
return mAppTransitionManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNavigationModeChanged(Mode newMode) {
|
||||
getDragLayer().recreateControllers();
|
||||
@@ -270,6 +278,12 @@ public abstract class BaseQuickstepLauncher extends Launcher
|
||||
return mTaskbarController != null && mTaskbarController.isViewInTaskbar(v);
|
||||
}
|
||||
|
||||
public boolean supportsAdaptiveIconAnimation(View clickedView) {
|
||||
return mAppTransitionManager.hasControlRemoteAppTransitionPermission()
|
||||
&& FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM.get()
|
||||
&& !isViewInTaskbar(clickedView);
|
||||
}
|
||||
|
||||
@Override
|
||||
public DragOptions getDefaultWorkspaceDragOptions() {
|
||||
if (mNextWorkspaceDragOptions != null) {
|
||||
@@ -286,8 +300,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
|
||||
|
||||
@Override
|
||||
public void useFadeOutAnimationForLauncherStart(CancellationSignal signal) {
|
||||
QuickstepAppTransitionManagerImpl appTransitionManager =
|
||||
(QuickstepAppTransitionManagerImpl) getAppTransitionManager();
|
||||
QuickstepTransitionManager appTransitionManager = getAppTransitionManager();
|
||||
appTransitionManager.setRemoteAnimationProvider(new RemoteAnimationProvider() {
|
||||
@Override
|
||||
public AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] appTargets,
|
||||
@@ -379,10 +392,14 @@ public abstract class BaseQuickstepLauncher extends Launcher
|
||||
}
|
||||
|
||||
@Override
|
||||
public ActivityOptions getActivityLaunchOptions(View v) {
|
||||
ActivityOptions activityOptions = super.getActivityLaunchOptions(v);
|
||||
if (activityOptions != null && mLastTouchUpTime > 0) {
|
||||
ActivityOptionsCompat.setLauncherSourceInfo(activityOptions, mLastTouchUpTime);
|
||||
public ActivityOptionsWrapper getActivityLaunchOptions(View v) {
|
||||
ActivityOptionsWrapper activityOptions =
|
||||
mAppTransitionManager.hasControlRemoteAppTransitionPermission()
|
||||
? mAppTransitionManager.getActivityLaunchOptions(this, v)
|
||||
: super.getActivityLaunchOptions(v);
|
||||
if (mLastTouchUpTime > 0) {
|
||||
ActivityOptionsCompat.setLauncherSourceInfo(
|
||||
activityOptions.options, mLastTouchUpTime);
|
||||
}
|
||||
return activityOptions;
|
||||
}
|
||||
|
||||
@@ -17,6 +17,7 @@ package com.android.launcher3;
|
||||
|
||||
import static com.android.launcher3.Utilities.postAsyncCallback;
|
||||
import static com.android.launcher3.util.DisplayController.getSingleFrameMs;
|
||||
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
|
||||
import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
|
||||
import static com.android.systemui.shared.recents.utilities.Utilities.postAtFrontOfQueueAsynchronously;
|
||||
|
||||
@@ -29,6 +30,7 @@ import android.os.Build;
|
||||
import android.os.Handler;
|
||||
|
||||
import androidx.annotation.BinderThread;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.UiThread;
|
||||
|
||||
import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
|
||||
@@ -37,8 +39,6 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
@TargetApi(Build.VERSION_CODES.P)
|
||||
public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat {
|
||||
|
||||
private static final String TAG = "LauncherAnimationRunner";
|
||||
|
||||
private final Handler mHandler;
|
||||
private final boolean mStartAtFrontOfQueue;
|
||||
private AnimationResult mAnimationResult;
|
||||
@@ -66,10 +66,7 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
|
||||
Runnable runnable) {
|
||||
Runnable r = () -> {
|
||||
finishExistingAnimation();
|
||||
mAnimationResult = new AnimationResult(() -> {
|
||||
UI_HELPER_EXECUTOR.execute(runnable);
|
||||
mAnimationResult = null;
|
||||
});
|
||||
mAnimationResult = new AnimationResult(() -> mAnimationResult = null, runnable);
|
||||
onCreateAnimation(transit, appTargets, wallpaperTargets, nonAppTargets,
|
||||
mAnimationResult);
|
||||
};
|
||||
@@ -126,37 +123,60 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
|
||||
|
||||
public static final class AnimationResult {
|
||||
|
||||
private final Runnable mFinishRunnable;
|
||||
private final Runnable mSyncFinishRunnable;
|
||||
private final Runnable mASyncFinishRunnable;
|
||||
|
||||
private AnimatorSet mAnimator;
|
||||
private Runnable mOnCompleteCallback;
|
||||
private boolean mFinished = false;
|
||||
private boolean mInitialized = false;
|
||||
|
||||
private AnimationResult(Runnable finishRunnable) {
|
||||
mFinishRunnable = finishRunnable;
|
||||
private AnimationResult(Runnable syncFinishRunnable, Runnable asyncFinishRunnable) {
|
||||
mSyncFinishRunnable = syncFinishRunnable;
|
||||
mASyncFinishRunnable = asyncFinishRunnable;
|
||||
}
|
||||
|
||||
@UiThread
|
||||
private void finish() {
|
||||
if (!mFinished) {
|
||||
mFinishRunnable.run();
|
||||
mSyncFinishRunnable.run();
|
||||
UI_HELPER_EXECUTOR.execute(() -> {
|
||||
mASyncFinishRunnable.run();
|
||||
if (mOnCompleteCallback != null) {
|
||||
MAIN_EXECUTOR.execute(mOnCompleteCallback);
|
||||
}
|
||||
});
|
||||
mFinished = true;
|
||||
}
|
||||
}
|
||||
|
||||
@UiThread
|
||||
public void setAnimation(AnimatorSet animation, Context context) {
|
||||
setAnimation(animation, context, null);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the animation to play for this app launch
|
||||
*/
|
||||
@UiThread
|
||||
public void setAnimation(AnimatorSet animation, Context context,
|
||||
@Nullable Runnable onCompleteCallback) {
|
||||
if (mInitialized) {
|
||||
throw new IllegalStateException("Animation already initialized");
|
||||
}
|
||||
mInitialized = true;
|
||||
mAnimator = animation;
|
||||
mOnCompleteCallback = onCompleteCallback;
|
||||
if (mAnimator == null) {
|
||||
finish();
|
||||
} else if (mFinished) {
|
||||
// Animation callback was already finished, skip the animation.
|
||||
mAnimator.start();
|
||||
mAnimator.end();
|
||||
if (mOnCompleteCallback != null) {
|
||||
mOnCompleteCallback.run();
|
||||
}
|
||||
} else {
|
||||
// Start the animation
|
||||
mAnimator.addListener(new AnimatorListenerAdapter() {
|
||||
|
||||
@@ -1,83 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.launcher3;
|
||||
|
||||
import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;
|
||||
import static com.android.launcher3.anim.Interpolators.LINEAR;
|
||||
import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;
|
||||
|
||||
import android.animation.AnimatorSet;
|
||||
import android.animation.ObjectAnimator;
|
||||
import android.content.Context;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.android.quickstep.TaskViewUtils;
|
||||
import com.android.quickstep.views.RecentsView;
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
|
||||
/**
|
||||
* A {@link QuickstepAppTransitionManagerImpl} that also implements recents transitions from
|
||||
* {@link RecentsView}.
|
||||
*/
|
||||
public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransitionManagerImpl {
|
||||
|
||||
public LauncherAppTransitionManagerImpl(Context context) {
|
||||
super(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isLaunchingFromRecents(@NonNull View v,
|
||||
@Nullable RemoteAnimationTargetCompat[] targets) {
|
||||
return mLauncher.getStateManager().getState().overviewUi
|
||||
&& findTaskViewToLaunch(mLauncher.getOverviewPanel(), v, targets) != null;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
|
||||
@NonNull RemoteAnimationTargetCompat[] appTargets,
|
||||
@NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing) {
|
||||
TaskViewUtils.composeRecentsLaunchAnimator(anim, v, appTargets, wallpaperTargets,
|
||||
launcherClosing, mLauncher.getStateManager(), mLauncher.getOverviewPanel(),
|
||||
mLauncher.getDepthController());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Runnable composeViewContentAnimator(@NonNull AnimatorSet anim, float[] alphas,
|
||||
float[] trans) {
|
||||
RecentsView overview = mLauncher.getOverviewPanel();
|
||||
ObjectAnimator alpha = ObjectAnimator.ofFloat(overview,
|
||||
RecentsView.CONTENT_ALPHA, alphas);
|
||||
alpha.setDuration(CONTENT_ALPHA_DURATION);
|
||||
alpha.setInterpolator(LINEAR);
|
||||
anim.play(alpha);
|
||||
overview.setFreezeViewVisibility(true);
|
||||
|
||||
ObjectAnimator transY = ObjectAnimator.ofFloat(overview, View.TRANSLATION_Y, trans);
|
||||
transY.setInterpolator(AGGRESSIVE_EASE);
|
||||
transY.setDuration(CONTENT_TRANSLATION_DURATION);
|
||||
anim.play(transY);
|
||||
|
||||
return () -> {
|
||||
overview.setFreezeViewVisibility(false);
|
||||
overview.setTranslationY(0);
|
||||
mLauncher.getStateManager().reapplyState();
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -46,8 +46,8 @@ public class LauncherInitListener extends ActivityInitListener<Launcher> {
|
||||
@Override
|
||||
public boolean handleInit(Launcher launcher, boolean alreadyOnHome) {
|
||||
if (mRemoteAnimationProvider != null) {
|
||||
QuickstepAppTransitionManagerImpl appTransitionManager =
|
||||
(QuickstepAppTransitionManagerImpl) launcher.getAppTransitionManager();
|
||||
QuickstepTransitionManager appTransitionManager =
|
||||
((BaseQuickstepLauncher) launcher).getAppTransitionManager();
|
||||
|
||||
// Set a one-time animation provider. After the first call, this will get cleared.
|
||||
// TODO: Probably also check the intended target id.
|
||||
|
||||
+73
-68
@@ -37,6 +37,7 @@ import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVIT
|
||||
import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS;
|
||||
import static com.android.launcher3.statehandlers.DepthController.DEPTH;
|
||||
import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
|
||||
import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;
|
||||
import static com.android.systemui.shared.system.QuickStepContract.getWindowCornerRadius;
|
||||
import static com.android.systemui.shared.system.QuickStepContract.supportsRoundedCornersOnWindows;
|
||||
import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
|
||||
@@ -47,7 +48,6 @@ import android.animation.AnimatorListenerAdapter;
|
||||
import android.animation.AnimatorSet;
|
||||
import android.animation.ObjectAnimator;
|
||||
import android.animation.ValueAnimator;
|
||||
import android.app.ActivityOptions;
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.res.Resources;
|
||||
@@ -69,20 +69,23 @@ import androidx.annotation.Nullable;
|
||||
import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
|
||||
import com.android.launcher3.allapps.AllAppsTransitionController;
|
||||
import com.android.launcher3.anim.AnimationSuccessListener;
|
||||
import com.android.launcher3.config.FeatureFlags;
|
||||
import com.android.launcher3.dragndrop.DragLayer;
|
||||
import com.android.launcher3.shortcuts.DeepShortcutView;
|
||||
import com.android.launcher3.statehandlers.DepthController;
|
||||
import com.android.launcher3.util.ActivityOptionsWrapper;
|
||||
import com.android.launcher3.util.DynamicResource;
|
||||
import com.android.launcher3.util.MultiValueAlpha;
|
||||
import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
|
||||
import com.android.launcher3.util.RunnableList;
|
||||
import com.android.launcher3.views.FloatingIconView;
|
||||
import com.android.quickstep.RemoteAnimationTargets;
|
||||
import com.android.quickstep.SystemUiProxy;
|
||||
import com.android.quickstep.TaskViewUtils;
|
||||
import com.android.quickstep.util.MultiValueUpdateListener;
|
||||
import com.android.quickstep.util.RemoteAnimationProvider;
|
||||
import com.android.quickstep.util.StaggeredWorkspaceAnim;
|
||||
import com.android.quickstep.util.SurfaceTransactionApplier;
|
||||
import com.android.quickstep.views.RecentsView;
|
||||
import com.android.systemui.shared.recents.IStartingWindowListener;
|
||||
import com.android.systemui.shared.system.ActivityCompat;
|
||||
import com.android.systemui.shared.system.ActivityOptionsCompat;
|
||||
@@ -99,12 +102,9 @@ import com.android.systemui.shared.system.WindowManagerWrapper;
|
||||
import java.util.LinkedHashMap;
|
||||
|
||||
/**
|
||||
* {@link LauncherAppTransitionManager} with Quickstep-specific app transitions for launching from
|
||||
* home and/or all-apps. Not used for 3p launchers.
|
||||
* Manages the opening and closing app transitions from Launcher
|
||||
*/
|
||||
@SuppressWarnings("unused")
|
||||
public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTransitionManager
|
||||
implements OnDeviceProfileChangeListener {
|
||||
public class QuickstepTransitionManager implements OnDeviceProfileChangeListener {
|
||||
|
||||
private static final String TAG = "QuickstepTransition";
|
||||
|
||||
@@ -115,8 +115,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
public static final int STATUS_BAR_TRANSITION_DURATION = 120;
|
||||
|
||||
/**
|
||||
* Since our animations decelerate heavily when finishing, we want to start status bar animations
|
||||
* x ms before the ending.
|
||||
* Since our animations decelerate heavily when finishing, we want to start status bar
|
||||
* animations x ms before the ending.
|
||||
*/
|
||||
public static final int STATUS_BAR_TRANSITION_PRE_DELAY = 96;
|
||||
|
||||
@@ -191,7 +191,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
// Will never be larger than MAX_NUM_TASKS
|
||||
private LinkedHashMap<Integer, Integer> mTypeForTaskId;
|
||||
|
||||
public QuickstepAppTransitionManagerImpl(Context context) {
|
||||
public QuickstepTransitionManager(Context context) {
|
||||
mLauncher = Launcher.cast(Launcher.getLauncher(context));
|
||||
mDragLayer = mLauncher.getDragLayer();
|
||||
mDragLayerAlpha = mDragLayer.getAlphaProperty(ALPHA_INDEX_TRANSITIONS);
|
||||
@@ -229,37 +229,29 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
mDeviceProfile = dp;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsAdaptiveIconAnimation(View clickedView) {
|
||||
return hasControlRemoteAppTransitionPermission()
|
||||
&& FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM.get()
|
||||
&& !mLauncher.isViewInTaskbar(clickedView);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return ActivityOptions with remote animations that controls how the window of the opening
|
||||
* targets are displayed.
|
||||
*/
|
||||
@Override
|
||||
public ActivityOptions getActivityLaunchOptions(Launcher launcher, View v) {
|
||||
if (hasControlRemoteAppTransitionPermission()) {
|
||||
boolean fromRecents = isLaunchingFromRecents(v, null /* targets */);
|
||||
mAppLaunchRunner = new AppLaunchAnimationRunner(mHandler, v);
|
||||
RemoteAnimationRunnerCompat runner = new WrappedLauncherAnimationRunner<>(
|
||||
mAppLaunchRunner, true /* startAtFrontOfQueue */);
|
||||
public ActivityOptionsWrapper getActivityLaunchOptions(Launcher launcher, View v) {
|
||||
boolean fromRecents = isLaunchingFromRecents(v, null /* targets */);
|
||||
RunnableList onEndCallback = new RunnableList();
|
||||
mAppLaunchRunner = new AppLaunchAnimationRunner(mHandler, v, onEndCallback);
|
||||
RemoteAnimationRunnerCompat runner = new WrappedLauncherAnimationRunner<>(
|
||||
mHandler, mAppLaunchRunner, true /* startAtFrontOfQueue */);
|
||||
|
||||
// Note that this duration is a guess as we do not know if the animation will be a
|
||||
// recents launch or not for sure until we know the opening app targets.
|
||||
long duration = fromRecents
|
||||
? RECENTS_LAUNCH_DURATION
|
||||
: APP_LAUNCH_DURATION;
|
||||
// Note that this duration is a guess as we do not know if the animation will be a
|
||||
// recents launch or not for sure until we know the opening app targets.
|
||||
long duration = fromRecents
|
||||
? RECENTS_LAUNCH_DURATION
|
||||
: APP_LAUNCH_DURATION;
|
||||
|
||||
long statusBarTransitionDelay = duration - STATUS_BAR_TRANSITION_DURATION
|
||||
- STATUS_BAR_TRANSITION_PRE_DELAY;
|
||||
return ActivityOptionsCompat.makeRemoteAnimation(new RemoteAnimationAdapterCompat(
|
||||
runner, duration, statusBarTransitionDelay));
|
||||
}
|
||||
return super.getActivityLaunchOptions(launcher, v);
|
||||
long statusBarTransitionDelay = duration - STATUS_BAR_TRANSITION_DURATION
|
||||
- STATUS_BAR_TRANSITION_PRE_DELAY;
|
||||
RemoteAnimationAdapterCompat adapterCompat =
|
||||
new RemoteAnimationAdapterCompat(runner, duration, statusBarTransitionDelay);
|
||||
return new ActivityOptionsWrapper(
|
||||
ActivityOptionsCompat.makeRemoteAnimation(adapterCompat), onEndCallback);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -272,8 +264,11 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
* @param targets apps that are opening/closing
|
||||
* @return true if the app is launching from recents, false if it most likely is not
|
||||
*/
|
||||
protected abstract boolean isLaunchingFromRecents(@NonNull View v,
|
||||
@Nullable RemoteAnimationTargetCompat[] targets);
|
||||
protected boolean isLaunchingFromRecents(@NonNull View v,
|
||||
@Nullable RemoteAnimationTargetCompat[] targets) {
|
||||
return mLauncher.getStateManager().getState().overviewUi
|
||||
&& findTaskViewToLaunch(mLauncher.getOverviewPanel(), v, targets) != null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Composes the animations for a launch from the recents list.
|
||||
@@ -283,9 +278,13 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
* @param appTargets the apps that are opening/closing
|
||||
* @param launcherClosing true if the launcher app is closing
|
||||
*/
|
||||
protected abstract void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
|
||||
protected void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v,
|
||||
@NonNull RemoteAnimationTargetCompat[] appTargets,
|
||||
@NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing);
|
||||
@NonNull RemoteAnimationTargetCompat[] wallpaperTargets, boolean launcherClosing) {
|
||||
TaskViewUtils.composeRecentsLaunchAnimator(anim, v, appTargets, wallpaperTargets,
|
||||
launcherClosing, mLauncher.getStateManager(), mLauncher.getOverviewPanel(),
|
||||
mLauncher.getDepthController());
|
||||
}
|
||||
|
||||
private boolean areAllTargetsTranslucent(@NonNull RemoteAnimationTargetCompat[] targets) {
|
||||
boolean isAllOpeningTargetTrs = true;
|
||||
@@ -483,8 +482,27 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
* @param trans the translation Y values to animator to over time
|
||||
* @return listener to run when the animation ends
|
||||
*/
|
||||
protected abstract Runnable composeViewContentAnimator(@NonNull AnimatorSet anim,
|
||||
float[] alphas, float[] trans);
|
||||
protected Runnable composeViewContentAnimator(@NonNull AnimatorSet anim,
|
||||
float[] alphas, float[] trans) {
|
||||
RecentsView overview = mLauncher.getOverviewPanel();
|
||||
ObjectAnimator alpha = ObjectAnimator.ofFloat(overview,
|
||||
RecentsView.CONTENT_ALPHA, alphas);
|
||||
alpha.setDuration(CONTENT_ALPHA_DURATION);
|
||||
alpha.setInterpolator(LINEAR);
|
||||
anim.play(alpha);
|
||||
overview.setFreezeViewVisibility(true);
|
||||
|
||||
ObjectAnimator transY = ObjectAnimator.ofFloat(overview, View.TRANSLATION_Y, trans);
|
||||
transY.setInterpolator(AGGRESSIVE_EASE);
|
||||
transY.setDuration(CONTENT_TRANSLATION_DURATION);
|
||||
anim.play(transY);
|
||||
|
||||
return () -> {
|
||||
overview.setFreezeViewVisibility(false);
|
||||
overview.setTranslationY(0);
|
||||
mLauncher.getStateManager().reapplyState();
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Animator that controls the window of the opening targets from app icons.
|
||||
@@ -686,7 +704,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
/**
|
||||
* Registers remote animations used when closing apps to home screen.
|
||||
*/
|
||||
@Override
|
||||
public void registerRemoteAnimations() {
|
||||
if (SEPARATE_RECENTS_ACTIVITY.get()) {
|
||||
return;
|
||||
@@ -698,7 +715,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
definition.addRemoteAnimation(WindowManagerWrapper.TRANSIT_WALLPAPER_OPEN,
|
||||
WindowManagerWrapper.ACTIVITY_TYPE_STANDARD,
|
||||
new RemoteAnimationAdapterCompat(
|
||||
new WrappedLauncherAnimationRunner<>(mWallpaperOpenRunner,
|
||||
new WrappedLauncherAnimationRunner<>(mHandler, mWallpaperOpenRunner,
|
||||
false /* startAtFrontOfQueue */),
|
||||
CLOSING_TRANSITION_DURATION_MS, 0 /* statusBarTransitionDelay */));
|
||||
|
||||
@@ -707,7 +724,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
definition.addRemoteAnimation(
|
||||
WindowManagerWrapper.TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER,
|
||||
new RemoteAnimationAdapterCompat(
|
||||
new WrappedLauncherAnimationRunner<>(mKeyguardGoingAwayRunner,
|
||||
new WrappedLauncherAnimationRunner<>(
|
||||
mHandler, mKeyguardGoingAwayRunner,
|
||||
true /* startAtFrontOfQueue */),
|
||||
CLOSING_TRANSITION_DURATION_MS, 0 /* statusBarTransitionDelay */));
|
||||
}
|
||||
@@ -719,7 +737,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
/**
|
||||
* Registers remote animations used when closing apps to home screen.
|
||||
*/
|
||||
@Override
|
||||
public void registerRemoteTransitions() {
|
||||
if (SEPARATE_RECENTS_ACTIVITY.get()) {
|
||||
return;
|
||||
@@ -727,26 +744,20 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
if (hasControlRemoteAppTransitionPermission()) {
|
||||
mWallpaperOpenTransitionRunner = createWallpaperOpenRunner(false /* fromUnlock */);
|
||||
mLauncherOpenTransition = RemoteAnimationAdapterCompat.buildRemoteTransition(
|
||||
new WrappedLauncherAnimationRunner<>(mWallpaperOpenTransitionRunner,
|
||||
new WrappedLauncherAnimationRunner<>(mHandler, mWallpaperOpenTransitionRunner,
|
||||
false /* startAtFrontOfQueue */));
|
||||
mLauncherOpenTransition.addHomeOpenCheck();
|
||||
SystemUiProxy.INSTANCE.getNoCreate().registerRemoteTransition(mLauncherOpenTransition);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActivityDestroyed() {
|
||||
super.onActivityDestroyed();
|
||||
unregisterRemoteAnimations();
|
||||
unregisterRemoteTransitions();
|
||||
SystemUiProxy.INSTANCE.getNoCreate().setStartingWindowListener(null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Unregisters all remote animations.
|
||||
*/
|
||||
@Override
|
||||
public void unregisterRemoteAnimations() {
|
||||
private void unregisterRemoteAnimations() {
|
||||
if (SEPARATE_RECENTS_ACTIVITY.get()) {
|
||||
return;
|
||||
}
|
||||
@@ -761,8 +772,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void unregisterRemoteTransitions() {
|
||||
private void unregisterRemoteTransitions() {
|
||||
if (SEPARATE_RECENTS_ACTIVITY.get()) {
|
||||
return;
|
||||
}
|
||||
@@ -883,7 +893,10 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
&& ENABLE_SHELL_STARTING_SURFACE;
|
||||
}
|
||||
|
||||
private boolean hasControlRemoteAppTransitionPermission() {
|
||||
/**
|
||||
* Returns true if we have permission to control remote app transisions
|
||||
*/
|
||||
public boolean hasControlRemoteAppTransitionPermission() {
|
||||
return mLauncher.checkSelfPermission(CONTROL_REMOTE_APP_TRANSITION_PERMISSION)
|
||||
== PackageManager.PERMISSION_GRANTED;
|
||||
}
|
||||
@@ -922,11 +935,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
mFromUnlock = fromUnlock;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Handler getHandler() {
|
||||
return mHandler;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreateAnimation(int transit,
|
||||
RemoteAnimationTargetCompat[] appTargets,
|
||||
@@ -1017,15 +1025,12 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
|
||||
private final Handler mHandler;
|
||||
private final View mV;
|
||||
private final RunnableList mOnEndCallback;
|
||||
|
||||
AppLaunchAnimationRunner(Handler handler, View v) {
|
||||
AppLaunchAnimationRunner(Handler handler, View v, RunnableList onEndCallback) {
|
||||
mHandler = handler;
|
||||
mV = v;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Handler getHandler() {
|
||||
return mHandler;
|
||||
mOnEndCallback = onEndCallback;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -1060,7 +1065,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
|
||||
anim.addListener(mForceInvisibleListener);
|
||||
}
|
||||
|
||||
result.setAnimation(anim, mLauncher);
|
||||
result.setAnimation(anim, mLauncher, mOnEndCallback::executeAllAndDestroy);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,8 +16,6 @@
|
||||
|
||||
package com.android.launcher3;
|
||||
|
||||
import android.os.Handler;
|
||||
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
|
||||
/**
|
||||
@@ -25,7 +23,7 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
* implementation.
|
||||
*/
|
||||
public interface WrappedAnimationRunnerImpl {
|
||||
Handler getHandler();
|
||||
|
||||
void onCreateAnimation(int transit,
|
||||
RemoteAnimationTargetCompat[] appTargets,
|
||||
RemoteAnimationTargetCompat[] wallpaperTargets,
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
|
||||
package com.android.launcher3;
|
||||
|
||||
import android.os.Handler;
|
||||
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
|
||||
import java.lang.ref.WeakReference;
|
||||
@@ -40,8 +42,9 @@ public class WrappedLauncherAnimationRunner<R extends WrappedAnimationRunnerImpl
|
||||
extends LauncherAnimationRunner {
|
||||
private WeakReference<R> mImpl;
|
||||
|
||||
public WrappedLauncherAnimationRunner(R animationRunnerImpl, boolean startAtFrontOfQueue) {
|
||||
super(animationRunnerImpl.getHandler(), startAtFrontOfQueue);
|
||||
public WrappedLauncherAnimationRunner(
|
||||
Handler handler, R animationRunnerImpl, boolean startAtFrontOfQueue) {
|
||||
super(handler, startAtFrontOfQueue);
|
||||
mImpl = new WeakReference<>(animationRunnerImpl);
|
||||
}
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ import androidx.annotation.Nullable;
|
||||
import com.android.launcher3.AbstractFloatingView;
|
||||
import com.android.launcher3.BaseQuickstepLauncher;
|
||||
import com.android.launcher3.LauncherState;
|
||||
import com.android.launcher3.QuickstepAppTransitionManagerImpl;
|
||||
import com.android.launcher3.QuickstepTransitionManager;
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.anim.PendingAnimation;
|
||||
import com.android.launcher3.folder.Folder;
|
||||
@@ -246,6 +246,11 @@ public class TaskbarController {
|
||||
* Removes the Taskbar from the screen, and removes any obsolete listeners etc.
|
||||
*/
|
||||
public void cleanup() {
|
||||
if (mAnimator != null) {
|
||||
// End this first, in case it relies on properties that are about to be cleaned up.
|
||||
mAnimator.end();
|
||||
}
|
||||
|
||||
mTaskbarView.cleanup();
|
||||
mTaskbarContainerView.cleanup();
|
||||
removeFromWindowManager();
|
||||
@@ -253,10 +258,6 @@ public class TaskbarController {
|
||||
mTaskbarVisibilityController.cleanup();
|
||||
mHotseatController.cleanup();
|
||||
mRecentsController.cleanup();
|
||||
|
||||
if (mAnimator != null) {
|
||||
mAnimator.end();
|
||||
}
|
||||
}
|
||||
|
||||
private void removeFromWindowManager() {
|
||||
@@ -298,7 +299,7 @@ public class TaskbarController {
|
||||
* Should be called from onResume() and onPause(), and animates the Taskbar accordingly.
|
||||
*/
|
||||
public void onLauncherResumedOrPaused(boolean isResumed) {
|
||||
long duration = QuickstepAppTransitionManagerImpl.CONTENT_ALPHA_DURATION;
|
||||
long duration = QuickstepTransitionManager.CONTENT_ALPHA_DURATION;
|
||||
if (mAnimator != null) {
|
||||
mAnimator.cancel();
|
||||
}
|
||||
|
||||
@@ -56,11 +56,14 @@ public class TaskbarDragListener implements View.OnDragListener {
|
||||
protected void init(DragLayer dragLayer) {
|
||||
mDragLayer = dragLayer;
|
||||
mDragLayer.setOnDragListener(this);
|
||||
// Temporarily disable haptics, as system will already play one when drag and drop starts.
|
||||
mDragLayer.setHapticFeedbackEnabled(false);
|
||||
}
|
||||
|
||||
private void cleanup() {
|
||||
mDragLayer.setOnDragListener(null);
|
||||
mLauncher.setNextWorkspaceDragOptions(null);
|
||||
mDragLayer.setHapticFeedbackEnabled(true);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -30,7 +30,6 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
|
||||
import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL;
|
||||
import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
|
||||
import static com.android.launcher3.testing.TestProtocol.QUICK_SWITCH_STATE_ORDINAL;
|
||||
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
|
||||
import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;
|
||||
|
||||
import android.content.Intent;
|
||||
@@ -262,14 +261,13 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
|
||||
RecentsView rv = getOverviewPanel();
|
||||
TaskView tasktolaunch = rv.getTaskViewAt(0);
|
||||
if (tasktolaunch != null) {
|
||||
tasktolaunch.launchTask(false, success -> {
|
||||
tasktolaunch.launchTask(success -> {
|
||||
if (!success) {
|
||||
getStateManager().goToState(OVERVIEW);
|
||||
tasktolaunch.notifyTaskLaunchFailed(TAG);
|
||||
} else {
|
||||
getStateManager().moveToRestState();
|
||||
}
|
||||
}, MAIN_EXECUTOR.getHandler());
|
||||
});
|
||||
} else {
|
||||
getStateManager().goToState(NORMAL);
|
||||
}
|
||||
|
||||
@@ -155,7 +155,7 @@ public class OverviewState extends LauncherState {
|
||||
public void onBackPressed(Launcher launcher) {
|
||||
TaskView taskView = launcher.<RecentsView>getOverviewPanel().getRunningTaskView();
|
||||
if (taskView != null) {
|
||||
taskView.launchTask(true);
|
||||
taskView.launchTaskAnimated();
|
||||
} else {
|
||||
super.onBackPressed(launcher);
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ import static android.widget.Toast.LENGTH_SHORT;
|
||||
|
||||
import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER;
|
||||
import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
|
||||
import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
|
||||
import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
|
||||
import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
|
||||
import static com.android.launcher3.anim.Interpolators.DEACCEL;
|
||||
import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
|
||||
@@ -1624,19 +1624,17 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
|
||||
mGestureState.updateLastStartedTaskId(taskId);
|
||||
boolean hasTaskPreviouslyAppeared = mGestureState.getPreviouslyAppearedTaskIds()
|
||||
.contains(taskId);
|
||||
nextTask.launchTask(false /* animate */, true /* freezeTaskList */,
|
||||
success -> {
|
||||
resultCallback.accept(success);
|
||||
if (success) {
|
||||
if (hasTaskPreviouslyAppeared) {
|
||||
onRestartPreviouslyAppearedTask();
|
||||
}
|
||||
} else {
|
||||
mActivityInterface.onLaunchTaskFailed();
|
||||
nextTask.notifyTaskLaunchFailed(TAG);
|
||||
mRecentsAnimationController.finish(true /* toRecents */, null);
|
||||
}
|
||||
}, MAIN_EXECUTOR.getHandler());
|
||||
nextTask.launchTask(success -> {
|
||||
resultCallback.accept(success);
|
||||
if (success) {
|
||||
if (hasTaskPreviouslyAppeared) {
|
||||
onRestartPreviouslyAppearedTask();
|
||||
}
|
||||
} else {
|
||||
mActivityInterface.onLaunchTaskFailed();
|
||||
mRecentsAnimationController.finish(true /* toRecents */, null);
|
||||
}
|
||||
}, true /* freezeTaskList */);
|
||||
} else {
|
||||
mActivityInterface.onLaunchTaskFailed();
|
||||
Toast.makeText(mContext, R.string.activity_not_available, LENGTH_SHORT).show();
|
||||
|
||||
@@ -132,7 +132,7 @@ public class OverviewCommandHelper {
|
||||
}
|
||||
int currentPage = recents.getNextPage();
|
||||
if (currentPage >= 0 && currentPage < recents.getTaskViewCount()) {
|
||||
((TaskView) recents.getPageAt(currentPage)).launchTask(true);
|
||||
((TaskView) recents.getPageAt(currentPage)).launchTaskAnimated();
|
||||
} else {
|
||||
recents.startHome();
|
||||
}
|
||||
|
||||
@@ -18,9 +18,9 @@ package com.android.quickstep;
|
||||
import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;
|
||||
import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;
|
||||
|
||||
import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
|
||||
import static com.android.launcher3.QuickstepAppTransitionManagerImpl.STATUS_BAR_TRANSITION_DURATION;
|
||||
import static com.android.launcher3.QuickstepAppTransitionManagerImpl.STATUS_BAR_TRANSITION_PRE_DELAY;
|
||||
import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
|
||||
import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_DURATION;
|
||||
import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_PRE_DELAY;
|
||||
import static com.android.launcher3.Utilities.createHomeIntent;
|
||||
import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;
|
||||
import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
|
||||
@@ -30,7 +30,6 @@ import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MOD
|
||||
import android.animation.Animator;
|
||||
import android.animation.AnimatorListenerAdapter;
|
||||
import android.animation.AnimatorSet;
|
||||
import android.app.ActivityOptions;
|
||||
import android.content.Intent;
|
||||
import android.content.res.Configuration;
|
||||
import android.os.Bundle;
|
||||
@@ -46,7 +45,6 @@ import com.android.launcher3.LauncherAnimationRunner.AnimationResult;
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.WrappedAnimationRunnerImpl;
|
||||
import com.android.launcher3.WrappedLauncherAnimationRunner;
|
||||
import com.android.launcher3.allapps.search.SearchAdapterProvider;
|
||||
import com.android.launcher3.anim.Interpolators;
|
||||
import com.android.launcher3.anim.PendingAnimation;
|
||||
import com.android.launcher3.compat.AccessibilityManagerCompat;
|
||||
@@ -54,7 +52,9 @@ import com.android.launcher3.statemanager.StateManager;
|
||||
import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
|
||||
import com.android.launcher3.statemanager.StateManager.StateHandler;
|
||||
import com.android.launcher3.statemanager.StatefulActivity;
|
||||
import com.android.launcher3.util.ActivityOptionsWrapper;
|
||||
import com.android.launcher3.util.ActivityTracker;
|
||||
import com.android.launcher3.util.RunnableList;
|
||||
import com.android.launcher3.util.SystemUiController;
|
||||
import com.android.launcher3.util.Themes;
|
||||
import com.android.launcher3.views.BaseDragLayer;
|
||||
@@ -94,7 +94,6 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
|
||||
|
||||
// Strong refs to runners which are cleared when the activity is destroyed
|
||||
private WrappedAnimationRunnerImpl mActivityLaunchAnimationRunner;
|
||||
private SearchAdapterProvider mSearchAdapterProvider;
|
||||
|
||||
/**
|
||||
* Init drag layer and overview panel views.
|
||||
@@ -172,42 +171,40 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ActivityOptions getActivityLaunchOptions(final View v) {
|
||||
public ActivityOptionsWrapper getActivityLaunchOptions(final View v) {
|
||||
if (!(v instanceof TaskView)) {
|
||||
return null;
|
||||
return super.getActivityLaunchOptions(v);
|
||||
}
|
||||
|
||||
final TaskView taskView = (TaskView) v;
|
||||
mActivityLaunchAnimationRunner = new WrappedAnimationRunnerImpl() {
|
||||
@Override
|
||||
public Handler getHandler() {
|
||||
return mUiHandler;
|
||||
}
|
||||
RunnableList onEndCallback = new RunnableList();
|
||||
|
||||
@Override
|
||||
public void onCreateAnimation(int transit,
|
||||
mActivityLaunchAnimationRunner = (int transit,
|
||||
RemoteAnimationTargetCompat[] appTargets,
|
||||
RemoteAnimationTargetCompat[] wallpaperTargets,
|
||||
RemoteAnimationTargetCompat[] nonAppTargets,
|
||||
AnimationResult result) {
|
||||
AnimatorSet anim = composeRecentsLaunchAnimator(taskView, appTargets,
|
||||
wallpaperTargets);
|
||||
anim.addListener(resetStateListener());
|
||||
result.setAnimation(anim, RecentsActivity.this);
|
||||
}
|
||||
AnimationResult result) -> {
|
||||
AnimatorSet anim = composeRecentsLaunchAnimator(taskView, appTargets,
|
||||
wallpaperTargets);
|
||||
anim.addListener(resetStateListener());
|
||||
result.setAnimation(anim, RecentsActivity.this, onEndCallback::executeAllAndDestroy);
|
||||
};
|
||||
|
||||
final LauncherAnimationRunner wrapper = new WrappedLauncherAnimationRunner<>(
|
||||
mActivityLaunchAnimationRunner, true /* startAtFrontOfQueue */);
|
||||
return ActivityOptionsCompat.makeRemoteAnimation(new RemoteAnimationAdapterCompat(
|
||||
mUiHandler, mActivityLaunchAnimationRunner, true /* startAtFrontOfQueue */);
|
||||
RemoteAnimationAdapterCompat adapterCompat = new RemoteAnimationAdapterCompat(
|
||||
wrapper, RECENTS_LAUNCH_DURATION,
|
||||
RECENTS_LAUNCH_DURATION - STATUS_BAR_TRANSITION_DURATION
|
||||
- STATUS_BAR_TRANSITION_PRE_DELAY));
|
||||
- STATUS_BAR_TRANSITION_PRE_DELAY);
|
||||
return new ActivityOptionsWrapper(
|
||||
ActivityOptionsCompat.makeRemoteAnimation(adapterCompat),
|
||||
onEndCallback);
|
||||
}
|
||||
|
||||
/**
|
||||
* Composes the animations for a launch from the recents list if possible.
|
||||
*/
|
||||
private AnimatorSet composeRecentsLaunchAnimator(TaskView taskView,
|
||||
private AnimatorSet composeRecentsLaunchAnimator(TaskView taskView,
|
||||
RemoteAnimationTargetCompat[] appTargets,
|
||||
RemoteAnimationTargetCompat[] wallpaperTargets) {
|
||||
AnimatorSet target = new AnimatorSet();
|
||||
|
||||
@@ -38,7 +38,6 @@ import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
|
||||
import com.android.launcher3.model.WellbeingModel;
|
||||
import com.android.launcher3.popup.SystemShortcut;
|
||||
import com.android.launcher3.popup.SystemShortcut.AppInfo;
|
||||
import com.android.launcher3.util.Executors;
|
||||
import com.android.launcher3.util.InstantAppResolver;
|
||||
import com.android.quickstep.views.RecentsView;
|
||||
import com.android.quickstep.views.TaskThumbnailView;
|
||||
@@ -54,7 +53,6 @@ import com.android.systemui.shared.system.WindowManagerWrapper;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
/**
|
||||
* Represents a system shortcut that can be shown for a recent task.
|
||||
@@ -281,15 +279,9 @@ public interface TaskShortcutFactory {
|
||||
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
Consumer<Boolean> resultCallback = success -> {
|
||||
if (success) {
|
||||
SystemUiProxy.INSTANCE.get(mTarget).startScreenPinning(
|
||||
mTaskView.getTask().key.id);
|
||||
} else {
|
||||
mTaskView.notifyTaskLaunchFailed(TAG);
|
||||
}
|
||||
};
|
||||
mTaskView.launchTask(true, resultCallback, Executors.MAIN_EXECUTOR.getHandler());
|
||||
if (mTaskView.launchTaskAnimated() != null) {
|
||||
SystemUiProxy.INSTANCE.get(mTarget).startScreenPinning(mTaskView.getTask().key.id);
|
||||
}
|
||||
dismissTaskMenuView(mTarget);
|
||||
mTarget.getStatsLogManager().logger().withItemInfo(mTaskView.getItemInfo())
|
||||
.log(LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_PIN_TAP);
|
||||
|
||||
@@ -18,7 +18,7 @@ package com.android.quickstep;
|
||||
import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
|
||||
import static com.android.launcher3.LauncherState.BACKGROUND_APP;
|
||||
import static com.android.launcher3.LauncherState.NORMAL;
|
||||
import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
|
||||
import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
|
||||
import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
|
||||
import static com.android.launcher3.anim.Interpolators.LINEAR;
|
||||
import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
|
||||
|
||||
@@ -21,7 +21,6 @@ import android.content.Context;
|
||||
import android.os.Handler;
|
||||
|
||||
import com.android.launcher3.LauncherAnimationRunner;
|
||||
import com.android.launcher3.LauncherAnimationRunner.AnimationResult;
|
||||
import com.android.launcher3.WrappedAnimationRunnerImpl;
|
||||
import com.android.launcher3.WrappedLauncherAnimationRunner;
|
||||
import com.android.systemui.shared.system.ActivityOptionsCompat;
|
||||
@@ -36,23 +35,10 @@ public abstract class RemoteAnimationProvider {
|
||||
RemoteAnimationTargetCompat[] wallpaperTargets);
|
||||
|
||||
ActivityOptions toActivityOptions(Handler handler, long duration, Context context) {
|
||||
mAnimationRunner = new WrappedAnimationRunnerImpl() {
|
||||
@Override
|
||||
public Handler getHandler() {
|
||||
return handler;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreateAnimation(int transit,
|
||||
RemoteAnimationTargetCompat[] appTargets,
|
||||
RemoteAnimationTargetCompat[] wallpaperTargets,
|
||||
RemoteAnimationTargetCompat[] nonApps,
|
||||
AnimationResult result) {
|
||||
mAnimationRunner = (transit, appTargets, wallpaperTargets, nonApps, result) ->
|
||||
result.setAnimation(createWindowAnimation(appTargets, wallpaperTargets), context);
|
||||
}
|
||||
};
|
||||
final LauncherAnimationRunner wrapper = new WrappedLauncherAnimationRunner(
|
||||
mAnimationRunner, false /* startAtFrontOfQueue */);
|
||||
handler, mAnimationRunner, false /* startAtFrontOfQueue */);
|
||||
return ActivityOptionsCompat.makeRemoteAnimation(
|
||||
new RemoteAnimationAdapterCompat(wrapper, duration, 0));
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ import static com.android.launcher3.LauncherState.NORMAL;
|
||||
import static com.android.launcher3.LauncherState.OVERVIEW;
|
||||
import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK;
|
||||
import static com.android.launcher3.LauncherState.SPRING_LOADED;
|
||||
import static com.android.launcher3.QuickstepAppTransitionManagerImpl.ALL_APPS_PROGRESS_OFF_SCREEN;
|
||||
import static com.android.launcher3.QuickstepTransitionManager.ALL_APPS_PROGRESS_OFF_SCREEN;
|
||||
import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;
|
||||
import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
|
||||
|
||||
|
||||
@@ -1467,7 +1467,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
|
||||
}
|
||||
}
|
||||
targetTask.setEndQuickswitchCuj(true);
|
||||
targetTask.launchTask(true);
|
||||
targetTask.launchTaskAnimated();
|
||||
}
|
||||
|
||||
public void setRunningTaskIconScaledDown(boolean isScaledDown) {
|
||||
@@ -2494,17 +2494,11 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
|
||||
}
|
||||
mPendingAnimation.addEndListener(isSuccess -> {
|
||||
if (isSuccess) {
|
||||
Consumer<Boolean> onLaunchResult = (result) -> {
|
||||
onTaskLaunchAnimationEnd(result);
|
||||
if (!result) {
|
||||
tv.notifyTaskLaunchFailed(TAG);
|
||||
}
|
||||
};
|
||||
if (LIVE_TILE.get()) {
|
||||
finishRecentsAnimation(false /* toRecents */, null);
|
||||
onLaunchResult.accept(true /* success */);
|
||||
onTaskLaunchAnimationEnd(true /* success */);
|
||||
} else {
|
||||
tv.launchTask(false, onLaunchResult, getHandler());
|
||||
tv.launchTask(this::onTaskLaunchAnimationEnd);
|
||||
}
|
||||
Task task = tv.getTask();
|
||||
if (task != null) {
|
||||
|
||||
@@ -23,12 +23,14 @@ import android.animation.Animator;
|
||||
import android.animation.AnimatorSet;
|
||||
import android.animation.ObjectAnimator;
|
||||
import android.content.Context;
|
||||
import android.graphics.Outline;
|
||||
import android.graphics.Rect;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.Gravity;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.ViewOutlineProvider;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
@@ -41,10 +43,10 @@ import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;
|
||||
import com.android.launcher3.config.FeatureFlags;
|
||||
import com.android.launcher3.popup.SystemShortcut;
|
||||
import com.android.launcher3.touch.PagedOrientationHandler;
|
||||
import com.android.launcher3.util.Themes;
|
||||
import com.android.launcher3.views.BaseDragLayer;
|
||||
import com.android.quickstep.TaskOverlayFactory;
|
||||
import com.android.quickstep.TaskUtils;
|
||||
import com.android.quickstep.util.TaskCornerRadius;
|
||||
|
||||
/**
|
||||
* Contains options for a recent task when long-pressing its icon.
|
||||
@@ -72,6 +74,7 @@ public class TaskMenuView extends AbstractFloatingView {
|
||||
|
||||
mActivity = BaseDraggingActivity.fromContext(context);
|
||||
mThumbnailTopMargin = getResources().getDimension(R.dimen.task_thumbnail_top_margin);
|
||||
setClipToOutline(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -108,6 +111,17 @@ public class TaskMenuView extends AbstractFloatingView {
|
||||
return (type & TYPE_TASK_MENU) != 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ViewOutlineProvider getOutlineProvider() {
|
||||
return new ViewOutlineProvider() {
|
||||
@Override
|
||||
public void getOutline(View view, Outline outline) {
|
||||
outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(),
|
||||
TaskCornerRadius.get(view.getContext()));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public void setPosition(float x, float y, PagedOrientationHandler pagedOrientationHandler) {
|
||||
float adjustedY = y + mThumbnailTopMargin;
|
||||
// Changing pivot to make computations easier
|
||||
@@ -260,7 +274,7 @@ public class TaskMenuView extends AbstractFloatingView {
|
||||
}
|
||||
|
||||
private RoundedRectRevealOutlineProvider createOpenCloseOutlineProvider() {
|
||||
float radius = Themes.getDialogCornerRadius(getContext());
|
||||
float radius = TaskCornerRadius.get(mContext);
|
||||
Rect fromRect = new Rect(0, 0, getWidth(), 0);
|
||||
Rect toRect = new Rect(0, 0, getWidth(), getHeight());
|
||||
return new RoundedRectRevealOutlineProvider(radius, radius, fromRect, toRect);
|
||||
|
||||
@@ -27,7 +27,7 @@ import static android.view.Surface.ROTATION_270;
|
||||
import static android.view.Surface.ROTATION_90;
|
||||
import static android.widget.Toast.LENGTH_SHORT;
|
||||
|
||||
import static com.android.launcher3.QuickstepAppTransitionManagerImpl.RECENTS_LAUNCH_DURATION;
|
||||
import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION;
|
||||
import static com.android.launcher3.Utilities.comp;
|
||||
import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
|
||||
import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
|
||||
@@ -37,6 +37,7 @@ import static com.android.launcher3.anim.Interpolators.LINEAR;
|
||||
import static com.android.launcher3.anim.Interpolators.TOUCH_RESPONSE_INTERPOLATOR;
|
||||
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS;
|
||||
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_LAUNCH_TAP;
|
||||
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
|
||||
import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
|
||||
import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
|
||||
|
||||
@@ -52,7 +53,6 @@ import android.graphics.Rect;
|
||||
import android.graphics.RectF;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.util.AttributeSet;
|
||||
import android.util.FloatProperty;
|
||||
import android.util.Log;
|
||||
@@ -66,6 +66,8 @@ import android.view.accessibility.AccessibilityNodeInfo;
|
||||
import android.widget.FrameLayout;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.android.launcher3.DeviceProfile;
|
||||
import com.android.launcher3.LauncherSettings;
|
||||
import com.android.launcher3.R;
|
||||
@@ -79,7 +81,9 @@ import com.android.launcher3.statemanager.StatefulActivity;
|
||||
import com.android.launcher3.testing.TestLogging;
|
||||
import com.android.launcher3.testing.TestProtocol;
|
||||
import com.android.launcher3.touch.PagedOrientationHandler;
|
||||
import com.android.launcher3.util.ActivityOptionsWrapper;
|
||||
import com.android.launcher3.util.ComponentKey;
|
||||
import com.android.launcher3.util.RunnableList;
|
||||
import com.android.launcher3.util.TransformingTouchDelegate;
|
||||
import com.android.launcher3.util.ViewPool.Reusable;
|
||||
import com.android.quickstep.RecentsModel;
|
||||
@@ -335,7 +339,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
|
||||
});
|
||||
anim.start();
|
||||
} else {
|
||||
launchTask(true /* animate */);
|
||||
launchTaskAnimated();
|
||||
}
|
||||
mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
|
||||
.log(LAUNCHER_TASK_LAUNCH_TAP);
|
||||
@@ -483,63 +487,62 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
|
||||
.createPlaybackController();
|
||||
}
|
||||
|
||||
public void launchTask(boolean animate) {
|
||||
launchTask(animate, false /* freezeTaskList */);
|
||||
}
|
||||
|
||||
public void launchTask(boolean animate, boolean freezeTaskList) {
|
||||
launchTask(animate, freezeTaskList, (result) -> {
|
||||
if (!result) {
|
||||
notifyTaskLaunchFailed(TAG);
|
||||
}
|
||||
}, getHandler());
|
||||
}
|
||||
|
||||
public void launchTask(boolean animate, Consumer<Boolean> resultCallback,
|
||||
Handler resultCallbackHandler) {
|
||||
launchTask(animate, false /* freezeTaskList */, resultCallback, resultCallbackHandler);
|
||||
}
|
||||
|
||||
public void launchTask(boolean animate, boolean freezeTaskList, Consumer<Boolean> resultCallback,
|
||||
Handler resultCallbackHandler) {
|
||||
/**
|
||||
* Starts the task associated with this view and animates the startup.
|
||||
* @return CompletionStage to indicate the animation completion or null if the launch failed.
|
||||
*/
|
||||
public RunnableList launchTaskAnimated() {
|
||||
if (mTask != null) {
|
||||
final ActivityOptions opts;
|
||||
TestLogging.recordEvent(
|
||||
TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask);
|
||||
if (animate) {
|
||||
opts = mActivity.getActivityLaunchOptions(this);
|
||||
if (freezeTaskList) {
|
||||
ActivityOptionsCompat.setFreezeRecentTasksList(opts);
|
||||
}
|
||||
ActivityManagerWrapper.getInstance().startActivityFromRecentsAsync(mTask.key,
|
||||
opts, resultCallback, resultCallbackHandler);
|
||||
ActivityOptionsWrapper opts = mActivity.getActivityLaunchOptions(this);
|
||||
if (ActivityManagerWrapper.getInstance()
|
||||
.startActivityFromRecents(mTask.key, opts.options)) {
|
||||
return opts.onEndCallback;
|
||||
} else {
|
||||
opts = ActivityOptionsCompat.makeCustomAnimation(getContext(), 0, 0, () -> {
|
||||
if (resultCallback != null) {
|
||||
// Only post the animation start after the system has indicated that the
|
||||
// transition has started
|
||||
resultCallbackHandler.post(() -> resultCallback.accept(true));
|
||||
}
|
||||
}, resultCallbackHandler);
|
||||
if (freezeTaskList) {
|
||||
ActivityOptionsCompat.setFreezeRecentTasksList(opts);
|
||||
}
|
||||
UI_HELPER_EXECUTOR.execute(
|
||||
() -> ActivityManagerWrapper.getInstance().startActivityFromRecentsAsync(
|
||||
mTask.key,
|
||||
opts,
|
||||
(success) -> {
|
||||
if (resultCallback != null && !success) {
|
||||
// If the call to start activity failed, then post the
|
||||
// result
|
||||
// immediately, otherwise, wait for the animation start
|
||||
// callback
|
||||
// from the activity options above
|
||||
resultCallbackHandler.post(
|
||||
() -> resultCallback.accept(false));
|
||||
}
|
||||
}, resultCallbackHandler));
|
||||
notifyTaskLaunchFailed(TAG);
|
||||
return null;
|
||||
}
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the task associated with this view without any animation
|
||||
*/
|
||||
public void launchTask(@NonNull Consumer<Boolean> callback) {
|
||||
launchTask(callback, false /* freezeTaskList */);
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the task associated with this view without any animation
|
||||
*/
|
||||
public void launchTask(@NonNull Consumer<Boolean> callback, boolean freezeTaskList) {
|
||||
if (mTask != null) {
|
||||
TestLogging.recordEvent(
|
||||
TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask);
|
||||
|
||||
// Indicate success once the system has indicated that the transition has started
|
||||
ActivityOptions opts = ActivityOptionsCompat.makeCustomAnimation(
|
||||
getContext(), 0, 0, () -> callback.accept(true), MAIN_EXECUTOR.getHandler());
|
||||
if (freezeTaskList) {
|
||||
ActivityOptionsCompat.setFreezeRecentTasksList(opts);
|
||||
}
|
||||
Task.TaskKey key = mTask.key;
|
||||
UI_HELPER_EXECUTOR.execute(() -> {
|
||||
if (!ActivityManagerWrapper.getInstance().startActivityFromRecents(key, opts)) {
|
||||
// If the call to start activity failed, then post the result immediately,
|
||||
// otherwise, wait for the animation start callback from the activity options
|
||||
// above
|
||||
MAIN_EXECUTOR.post(() -> {
|
||||
notifyTaskLaunchFailed(TAG);
|
||||
callback.accept(false);
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
callback.accept(false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -769,7 +772,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
|
||||
}
|
||||
if (view != null) {
|
||||
mContextualChipWrapper = view;
|
||||
LayoutParams layoutParams = new LayoutParams(LayoutParams.MATCH_PARENT,
|
||||
LayoutParams layoutParams = new LayoutParams(((View) getParent()).getMeasuredWidth(),
|
||||
LayoutParams.WRAP_CONTENT);
|
||||
layoutParams.gravity = BOTTOM | CENTER_HORIZONTAL;
|
||||
int expectedChipHeight = getExpectedViewHeight(view);
|
||||
@@ -1123,7 +1126,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
|
||||
return getRecentsView().mOrientationState.getOrientationHandler();
|
||||
}
|
||||
|
||||
public void notifyTaskLaunchFailed(String tag) {
|
||||
private void notifyTaskLaunchFailed(String tag) {
|
||||
String msg = "Failed to launch task";
|
||||
if (mTask != null) {
|
||||
msg += " (task=" + mTask.key.baseIntent + " userId=" + mTask.key.userId + ")";
|
||||
|
||||
@@ -61,7 +61,6 @@
|
||||
<!-- Various classes overriden by projects/build flavors. -->
|
||||
<string name="folder_name_provider_class" translatable="false"></string>
|
||||
<string name="stats_log_manager_class" translatable="false"></string>
|
||||
<string name="app_transition_manager_class" translatable="false"></string>
|
||||
<string name="instant_app_resolver_class" translatable="false"></string>
|
||||
<string name="main_process_initializer_class" translatable="false"></string>
|
||||
<string name="app_launch_tracker_class" translatable="false"></string>
|
||||
@@ -90,6 +89,7 @@
|
||||
<string name="wallpaper_picker_package" translatable="false"></string>
|
||||
<string name="calendar_component_name" translatable="false"></string>
|
||||
<string name="clock_component_name" translatable="false"></string>
|
||||
<string name="local_colors_extraction_class" translatable="false"></string>
|
||||
|
||||
<!-- Accessibility actions -->
|
||||
<item type="id" name="action_remove" />
|
||||
@@ -188,4 +188,8 @@
|
||||
</string-array>
|
||||
|
||||
<string-array name="filtered_components" ></string-array>
|
||||
|
||||
<!-- Name of the class used to generate colors from the wallpaper colors. Must be implementing the LauncherAppWidgetHostView.ColorGenerator interface. -->
|
||||
<string name="color_generator_class" translatable="false"/>
|
||||
|
||||
</resources>
|
||||
@@ -40,9 +40,9 @@
|
||||
|
||||
<!-- Widgets -->
|
||||
<!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] -->
|
||||
<string name="long_press_widget_to_add">Touch & hold to pick up a widget.</string>
|
||||
<string name="long_press_widget_to_add">Touch & hold to move a widget.</string>
|
||||
<!-- Accessibility spoken hint message in widget picker, which allows user to add a widget. Custom action is the label for additional accessibility actions available in this mode [CHAR_LIMIT=100] -->
|
||||
<string name="long_accessible_way_to_add">Double-tap & hold to pick up a widget or use custom actions.</string>
|
||||
<string name="long_accessible_way_to_add">Double-tap & hold to move a widget or use custom actions.</string>
|
||||
<!-- The format string for the dimensions of a widget in the drawer -->
|
||||
<!-- There is a special version of this format string for Farsi -->
|
||||
<string name="widget_dims_format">%1$d \u00d7 %2$d</string>
|
||||
@@ -104,9 +104,9 @@
|
||||
|
||||
<!-- Drag and drop -->
|
||||
<!-- Message to tell the user to press and hold on a shortcut to add it [CHAR_LIMIT=50] -->
|
||||
<string name="long_press_shortcut_to_add">Touch & hold to pick up a shortcut.</string>
|
||||
<string name="long_press_shortcut_to_add">Touch & hold to move a shortcut.</string>
|
||||
<!-- Accessibility spoken hint message in deep shortcut menu, which allows user to add a shortcut. Custom action is the label for additional accessibility actions available in this mode [CHAR_LIMIT=200] -->
|
||||
<string name="long_accessible_way_to_add_shortcut">Double-tap & hold to pick up a shortcut or use custom actions.</string>
|
||||
<string name="long_accessible_way_to_add_shortcut">Double-tap & hold to move a shortcut or use custom actions.</string>
|
||||
|
||||
<skip />
|
||||
<!-- Error message when user has filled a home screen -->
|
||||
|
||||
@@ -16,6 +16,15 @@
|
||||
// Launcher Robolectric test target.
|
||||
//
|
||||
// "robolectric_android-all-stub", not needed, we write our own stubs
|
||||
package {
|
||||
// See: http://go/android-license-faq
|
||||
// A large-scale-change added 'default_applicable_licenses' to import
|
||||
// all of the 'license_kinds' from "packages_apps_Launcher3_license"
|
||||
// to get the below license kinds:
|
||||
// SPDX-license-identifier-Apache-2.0
|
||||
default_applicable_licenses: ["packages_apps_Launcher3_license"],
|
||||
}
|
||||
|
||||
android_robolectric_test {
|
||||
name: "LauncherRoboTests",
|
||||
srcs: [
|
||||
@@ -43,4 +52,3 @@ android_robolectric_test {
|
||||
timeout: 36000,
|
||||
},
|
||||
}
|
||||
|
||||
+81
@@ -0,0 +1,81 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.launcher3.widget.picker.search;
|
||||
|
||||
import static android.os.Looper.getMainLooper;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.ArgumentMatchers.matches;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.robolectric.Shadows.shadowOf;
|
||||
|
||||
import com.android.launcher3.search.SearchCallback;
|
||||
import com.android.launcher3.widget.model.WidgetsListBaseEntry;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Captor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class SimpleWidgetsSearchAlgorithmTest {
|
||||
|
||||
private SimpleWidgetsSearchAlgorithm mSimpleWidgetsSearchAlgorithm;
|
||||
@Mock
|
||||
private WidgetsPickerSearchPipeline mSearchPipeline;
|
||||
@Mock
|
||||
private SearchCallback<WidgetsListBaseEntry> mSearchCallback;
|
||||
@Captor
|
||||
private ArgumentCaptor<Consumer<List<WidgetsListBaseEntry>>> mConsumerCaptor;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mSimpleWidgetsSearchAlgorithm = new SimpleWidgetsSearchAlgorithm(mSearchPipeline);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void doSearch_shouldQueryPipeline() {
|
||||
mSimpleWidgetsSearchAlgorithm.doSearch("abc", mSearchCallback);
|
||||
|
||||
verify(mSearchPipeline).query(eq("abc"), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void doSearch_shouldInformSearchCallbackOnQueryResult() {
|
||||
ArrayList<WidgetsListBaseEntry> baseEntries = new ArrayList<>();
|
||||
|
||||
mSimpleWidgetsSearchAlgorithm.doSearch("abc", mSearchCallback);
|
||||
|
||||
verify(mSearchPipeline).query(eq("abc"), mConsumerCaptor.capture());
|
||||
mConsumerCaptor.getValue().accept(baseEntries);
|
||||
shadowOf(getMainLooper()).idle();
|
||||
// Verify SearchCallback#onSearchResult receives a query token along with the search
|
||||
// results. The query token is the original query string concatenated with the query
|
||||
// timestamp.
|
||||
verify(mSearchCallback).onSearchResult(matches("abc\t\\d*"), eq(baseEntries));
|
||||
}
|
||||
}
|
||||
+182
@@ -0,0 +1,182 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.launcher3.widget.picker.search;
|
||||
|
||||
import static android.os.Looper.getMainLooper;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.doAnswer;
|
||||
import static org.robolectric.Shadows.shadowOf;
|
||||
|
||||
import android.appwidget.AppWidgetProviderInfo;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.graphics.Bitmap;
|
||||
import android.os.UserHandle;
|
||||
|
||||
import com.android.launcher3.InvariantDeviceProfile;
|
||||
import com.android.launcher3.icons.BitmapInfo;
|
||||
import com.android.launcher3.icons.ComponentWithLabel;
|
||||
import com.android.launcher3.icons.IconCache;
|
||||
import com.android.launcher3.model.WidgetItem;
|
||||
import com.android.launcher3.model.data.PackageItemInfo;
|
||||
import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
|
||||
import com.android.launcher3.widget.model.WidgetsListContentEntry;
|
||||
import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.shadows.ShadowPackageManager;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class SimpleWidgetsSearchPipelineTest {
|
||||
private static final SimpleWidgetsSearchPipeline.StringMatcher MATCHER =
|
||||
SimpleWidgetsSearchPipeline.StringMatcher.getInstance();
|
||||
|
||||
@Mock private IconCache mIconCache;
|
||||
|
||||
private InvariantDeviceProfile mTestProfile;
|
||||
private WidgetsListHeaderEntry mCalendarHeaderEntry;
|
||||
private WidgetsListContentEntry mCalendarContentEntry;
|
||||
private WidgetsListHeaderEntry mCameraHeaderEntry;
|
||||
private WidgetsListContentEntry mCameraContentEntry;
|
||||
private WidgetsListHeaderEntry mClockHeaderEntry;
|
||||
private WidgetsListContentEntry mClockContentEntry;
|
||||
private Context mContext;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
doAnswer(invocation -> ((ComponentWithLabel) invocation.getArgument(0))
|
||||
.getComponent().getPackageName())
|
||||
.when(mIconCache).getTitleNoCache(any());
|
||||
mTestProfile = new InvariantDeviceProfile();
|
||||
mTestProfile.numRows = 5;
|
||||
mTestProfile.numColumns = 5;
|
||||
mContext = RuntimeEnvironment.application;
|
||||
|
||||
mCalendarHeaderEntry =
|
||||
createWidgetsHeaderEntry("com.example.android.Calendar", "Calendar", 2);
|
||||
mCalendarContentEntry =
|
||||
createWidgetsContentEntry("com.example.android.Calendar", "Calendar", 2);
|
||||
mCameraHeaderEntry = createWidgetsHeaderEntry("com.example.android.Camera", "Camera", 5);
|
||||
mCameraContentEntry = createWidgetsContentEntry("com.example.android.Camera", "Camera", 5);
|
||||
mClockHeaderEntry = createWidgetsHeaderEntry("com.example.android.Clock", "Clock", 3);
|
||||
mClockContentEntry = createWidgetsContentEntry("com.example.android.Clock", "Clock", 3);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void query_shouldInformCallbackWithResultsMatchedOnAppName() {
|
||||
SimpleWidgetsSearchPipeline pipeline = new SimpleWidgetsSearchPipeline(
|
||||
List.of(mCalendarHeaderEntry, mCalendarContentEntry, mCameraHeaderEntry,
|
||||
mCameraContentEntry, mClockHeaderEntry, mClockContentEntry));
|
||||
|
||||
pipeline.query("Ca", results ->
|
||||
assertEquals(results, List.of(mCalendarHeaderEntry, mCalendarContentEntry,
|
||||
mCameraHeaderEntry, mCameraContentEntry)));
|
||||
shadowOf(getMainLooper()).idle();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMatches() {
|
||||
assertTrue(MATCHER.matches("q", "Q"));
|
||||
assertTrue(MATCHER.matches("q", " Q"));
|
||||
assertTrue(MATCHER.matches("e", "elephant"));
|
||||
assertTrue(MATCHER.matches("eL", "Elephant"));
|
||||
assertTrue(MATCHER.matches("elephant ", "elephant"));
|
||||
assertTrue(MATCHER.matches("whitec", "white cow"));
|
||||
assertTrue(MATCHER.matches("white c", "white cow"));
|
||||
assertTrue(MATCHER.matches("white ", "white cow"));
|
||||
assertTrue(MATCHER.matches("white c", "white cow"));
|
||||
assertTrue(MATCHER.matches("电", "电子邮件"));
|
||||
assertTrue(MATCHER.matches("电子", "电子邮件"));
|
||||
assertTrue(MATCHER.matches("다", "다운로드"));
|
||||
assertTrue(MATCHER.matches("드", "드라이브"));
|
||||
assertTrue(MATCHER.matches("åbç", "abc"));
|
||||
assertTrue(MATCHER.matches("ål", "Alpha"));
|
||||
|
||||
assertFalse(MATCHER.matches("phant", "elephant"));
|
||||
assertFalse(MATCHER.matches("elephants", "elephant"));
|
||||
assertFalse(MATCHER.matches("cow", "white cow"));
|
||||
assertFalse(MATCHER.matches("cow", "whiteCow"));
|
||||
assertFalse(MATCHER.matches("dog", "cats&Dogs"));
|
||||
assertFalse(MATCHER.matches("ba", "Bot"));
|
||||
assertFalse(MATCHER.matches("ba", "bot"));
|
||||
assertFalse(MATCHER.matches("子", "电子邮件"));
|
||||
assertFalse(MATCHER.matches("邮件", "电子邮件"));
|
||||
assertFalse(MATCHER.matches("ㄷ", "다운로드 드라이브"));
|
||||
assertFalse(MATCHER.matches("ㄷㄷ", "다운로드 드라이브"));
|
||||
assertFalse(MATCHER.matches("åç", "abc"));
|
||||
}
|
||||
|
||||
private WidgetsListHeaderEntry createWidgetsHeaderEntry(String packageName, String appName,
|
||||
int numOfWidgets) {
|
||||
List<WidgetItem> widgetItems = generateWidgetItems(packageName, numOfWidgets);
|
||||
PackageItemInfo pInfo = createPackageItemInfo(packageName, appName,
|
||||
widgetItems.get(0).user);
|
||||
|
||||
return new WidgetsListHeaderEntry(pInfo, /* titleSectionName= */ "", widgetItems);
|
||||
}
|
||||
|
||||
private WidgetsListContentEntry createWidgetsContentEntry(String packageName, String appName,
|
||||
int numOfWidgets) {
|
||||
List<WidgetItem> widgetItems = generateWidgetItems(packageName, numOfWidgets);
|
||||
PackageItemInfo pInfo = createPackageItemInfo(packageName, appName,
|
||||
widgetItems.get(0).user);
|
||||
|
||||
return new WidgetsListContentEntry(pInfo, /* titleSectionName= */ "", widgetItems);
|
||||
}
|
||||
|
||||
private PackageItemInfo createPackageItemInfo(String packageName, String appName,
|
||||
UserHandle userHandle) {
|
||||
PackageItemInfo pInfo = new PackageItemInfo(packageName);
|
||||
pInfo.title = appName;
|
||||
pInfo.user = userHandle;
|
||||
pInfo.bitmap = BitmapInfo.of(Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8), 0);
|
||||
return pInfo;
|
||||
}
|
||||
|
||||
private List<WidgetItem> generateWidgetItems(String packageName, int numOfWidgets) {
|
||||
ShadowPackageManager packageManager = shadowOf(mContext.getPackageManager());
|
||||
ArrayList<WidgetItem> widgetItems = new ArrayList<>();
|
||||
for (int i = 0; i < numOfWidgets; i++) {
|
||||
ComponentName cn = ComponentName.createRelative(packageName, ".SampleWidget" + i);
|
||||
AppWidgetProviderInfo widgetInfo = new AppWidgetProviderInfo();
|
||||
widgetInfo.provider = cn;
|
||||
ReflectionHelpers.setField(widgetInfo, "providerInfo",
|
||||
packageManager.addReceiverIfNotPresent(cn));
|
||||
|
||||
WidgetItem widgetItem = new WidgetItem(
|
||||
LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, widgetInfo),
|
||||
mTestProfile, mIconCache);
|
||||
widgetItems.add(widgetItem);
|
||||
}
|
||||
return widgetItems;
|
||||
}
|
||||
}
|
||||
@@ -279,7 +279,7 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
|
||||
/**
|
||||
* Used to set the override visibility state, used only to handle the transition home with the
|
||||
* recents animation.
|
||||
* @see QuickstepAppTransitionManagerImpl#createWallpaperOpenRunner
|
||||
* @see QuickstepTransitionManager#createWallpaperOpenRunner
|
||||
*/
|
||||
public void addForceInvisibleFlag(@InvisibilityFlags int flag) {
|
||||
mForceInvisible |= flag;
|
||||
|
||||
@@ -27,6 +27,7 @@ import android.content.res.Configuration;
|
||||
import android.graphics.Insets;
|
||||
import android.graphics.Point;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.Bundle;
|
||||
import android.os.Process;
|
||||
import android.os.StrictMode;
|
||||
@@ -40,6 +41,7 @@ import android.view.WindowInsets.Type;
|
||||
import android.view.WindowMetrics;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.android.launcher3.LauncherSettings.Favorites;
|
||||
@@ -52,10 +54,12 @@ import com.android.launcher3.model.data.ItemInfo;
|
||||
import com.android.launcher3.model.data.WorkspaceItemInfo;
|
||||
import com.android.launcher3.touch.ItemClickHandler;
|
||||
import com.android.launcher3.uioverrides.WallpaperColorInfo;
|
||||
import com.android.launcher3.util.ActivityOptionsWrapper;
|
||||
import com.android.launcher3.util.DisplayController;
|
||||
import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener;
|
||||
import com.android.launcher3.util.DisplayController.Info;
|
||||
import com.android.launcher3.util.PackageManagerHelper;
|
||||
import com.android.launcher3.util.RunnableList;
|
||||
import com.android.launcher3.util.Themes;
|
||||
import com.android.launcher3.util.TraceHelper;
|
||||
import com.android.launcher3.util.WindowBounds;
|
||||
@@ -76,6 +80,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
|
||||
protected boolean mIsSafeModeEnabled;
|
||||
|
||||
private Runnable mOnStartCallback;
|
||||
private RunnableList mOnResumeCallbacks = new RunnableList();
|
||||
|
||||
private int mThemeRes = R.style.AppTheme;
|
||||
|
||||
@@ -97,6 +102,16 @@ public abstract class BaseDraggingActivity extends BaseActivity
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
mOnResumeCallbacks.executeAllAndClear();
|
||||
}
|
||||
|
||||
public void addOnResumeCallback(Runnable callback) {
|
||||
mOnResumeCallbacks.add(callback);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo) {
|
||||
updateTheme();
|
||||
@@ -149,20 +164,35 @@ public abstract class BaseDraggingActivity extends BaseActivity
|
||||
return new Rect(pos[0], pos[1], pos[0] + v.getWidth(), pos[1] + v.getHeight());
|
||||
}
|
||||
|
||||
public final Bundle getActivityLaunchOptionsAsBundle(View v) {
|
||||
ActivityOptions activityOptions = getActivityLaunchOptions(v);
|
||||
return activityOptions == null ? null : activityOptions.toBundle();
|
||||
@NonNull
|
||||
public ActivityOptionsWrapper getActivityLaunchOptions(View v) {
|
||||
int left = 0, top = 0;
|
||||
int width = v.getMeasuredWidth(), height = v.getMeasuredHeight();
|
||||
if (v instanceof BubbleTextView) {
|
||||
// Launch from center of icon, not entire view
|
||||
Drawable icon = ((BubbleTextView) v).getIcon();
|
||||
if (icon != null) {
|
||||
Rect bounds = icon.getBounds();
|
||||
left = (width - bounds.width()) / 2;
|
||||
top = v.getPaddingTop();
|
||||
width = bounds.width();
|
||||
height = bounds.height();
|
||||
}
|
||||
}
|
||||
ActivityOptions options =
|
||||
ActivityOptions.makeClipRevealAnimation(v, left, top, width, height);
|
||||
RunnableList callback = new RunnableList();
|
||||
addOnResumeCallback(callback::executeAllAndDestroy);
|
||||
return new ActivityOptionsWrapper(options, callback);
|
||||
}
|
||||
|
||||
public abstract ActivityOptions getActivityLaunchOptions(View v);
|
||||
|
||||
public boolean startActivitySafely(View v, Intent intent, @Nullable ItemInfo item) {
|
||||
if (mIsSafeModeEnabled && !PackageManagerHelper.isSystemApp(this, intent)) {
|
||||
Toast.makeText(this, R.string.safemode_shortcut_error, Toast.LENGTH_SHORT).show();
|
||||
return false;
|
||||
}
|
||||
|
||||
Bundle optsBundle = (v != null) ? getActivityLaunchOptionsAsBundle(v) : null;
|
||||
Bundle optsBundle = (v != null) ? getActivityLaunchOptions(v).toBundle() : null;
|
||||
UserHandle user = item == null ? null : item.user;
|
||||
|
||||
// Prepare intent
|
||||
|
||||
@@ -50,7 +50,6 @@ import android.widget.TextView;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.UiThread;
|
||||
|
||||
import com.android.launcher3.Launcher.OnResumeCallback;
|
||||
import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
|
||||
import com.android.launcher3.config.FeatureFlags;
|
||||
import com.android.launcher3.dot.DotInfo;
|
||||
@@ -81,7 +80,7 @@ import java.text.NumberFormat;
|
||||
* because we want to make the bubble taller than the text and TextView's clip is
|
||||
* too aggressive.
|
||||
*/
|
||||
public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, OnResumeCallback,
|
||||
public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
|
||||
IconLabelDotView, DraggableView, Reorderable {
|
||||
|
||||
private static final int DISPLAY_WORKSPACE = 0;
|
||||
@@ -431,13 +430,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLauncherResume() {
|
||||
// Reset the pressed state of icon that was locked in the press state while activity
|
||||
// was launching
|
||||
setStayPressed(false);
|
||||
}
|
||||
|
||||
void clearPressedBackground() {
|
||||
setPressed(false);
|
||||
setStayPressed(false);
|
||||
|
||||
@@ -61,7 +61,6 @@ import android.animation.AnimatorSet;
|
||||
import android.animation.ObjectAnimator;
|
||||
import android.animation.ValueAnimator;
|
||||
import android.annotation.TargetApi;
|
||||
import android.app.ActivityOptions;
|
||||
import android.appwidget.AppWidgetHostView;
|
||||
import android.appwidget.AppWidgetManager;
|
||||
import android.content.ActivityNotFoundException;
|
||||
@@ -276,7 +275,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
|
||||
|
||||
private static final int THEME_CROSS_FADE_ANIMATION_DURATION = 375;
|
||||
|
||||
private LauncherAppTransitionManager mAppTransitionManager;
|
||||
private Configuration mOldConfig;
|
||||
|
||||
private LiveSearchManager mLiveSearchManager;
|
||||
@@ -312,8 +310,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
|
||||
@Thunk
|
||||
boolean mWorkspaceLoading = true;
|
||||
|
||||
private ArrayList<OnResumeCallback> mOnResumeCallbacks = new ArrayList<>();
|
||||
|
||||
// Used to notify when an activity launch has been deferred because launcher is not yet resumed
|
||||
// TODO: See if we can remove this later
|
||||
private Runnable mOnDeferredActivityLaunchCallback;
|
||||
@@ -419,9 +415,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
|
||||
crossFadeWithPreviousAppearance();
|
||||
mPopupDataProvider = new PopupDataProvider(this::updateNotificationDots);
|
||||
|
||||
mAppTransitionManager = LauncherAppTransitionManager.newInstance(this);
|
||||
mAppTransitionManager.registerRemoteAnimations();
|
||||
|
||||
boolean internalStateHandled = ACTIVITY_TRACKER.handleCreate(this);
|
||||
if (internalStateHandled) {
|
||||
if (savedInstanceState != null) {
|
||||
@@ -1090,15 +1083,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
|
||||
TraceHelper.FLAG_UI_EVENT);
|
||||
super.onResume();
|
||||
|
||||
if (!mOnResumeCallbacks.isEmpty()) {
|
||||
final ArrayList<OnResumeCallback> resumeCallbacks = new ArrayList<>(mOnResumeCallbacks);
|
||||
mOnResumeCallbacks.clear();
|
||||
for (int i = resumeCallbacks.size() - 1; i >= 0; i--) {
|
||||
resumeCallbacks.get(i).onLauncherResume();
|
||||
}
|
||||
resumeCallbacks.clear();
|
||||
}
|
||||
|
||||
if (mDeferOverlayCallbacks) {
|
||||
scheduleDeferredCheck();
|
||||
} else {
|
||||
@@ -1609,7 +1593,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
|
||||
LauncherAppState.getIDP(this).removeOnChangeListener(this);
|
||||
|
||||
mOverlayManager.onActivityDestroyed(this);
|
||||
mAppTransitionManager.onActivityDestroyed();
|
||||
mUserChangedCallbackCloseable.close();
|
||||
mLiveSearchManager.stop();
|
||||
}
|
||||
@@ -1933,16 +1916,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
|
||||
}
|
||||
}
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.M)
|
||||
@Override
|
||||
public ActivityOptions getActivityLaunchOptions(View v) {
|
||||
return mAppTransitionManager.getActivityLaunchOptions(this, v);
|
||||
}
|
||||
|
||||
public LauncherAppTransitionManager getAppTransitionManager() {
|
||||
return mAppTransitionManager;
|
||||
}
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.M)
|
||||
@Override
|
||||
protected boolean onErrorStartingShortcut(Intent intent, ItemInfo info) {
|
||||
@@ -1993,7 +1966,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
|
||||
// state when we return to launcher.
|
||||
BubbleTextView btv = (BubbleTextView) v;
|
||||
btv.setStayPressed(true);
|
||||
addOnResumeCallback(btv);
|
||||
addOnResumeCallback(() -> btv.setStayPressed(false));
|
||||
}
|
||||
return success;
|
||||
}
|
||||
@@ -2037,10 +2010,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
|
||||
return result;
|
||||
}
|
||||
|
||||
public void addOnResumeCallback(OnResumeCallback callback) {
|
||||
mOnResumeCallbacks.add(callback);
|
||||
}
|
||||
|
||||
/**
|
||||
* Persistant callback which notifies when an activity launch is deferred because the activity
|
||||
* was not yet resumed.
|
||||
@@ -2814,15 +2783,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
|
||||
return (T) activityContext;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Callback for listening for onResume
|
||||
*/
|
||||
public interface OnResumeCallback {
|
||||
|
||||
void onLauncherResume();
|
||||
}
|
||||
|
||||
/**
|
||||
* Cross-fades the launcher's updated appearance with its previous appearance.
|
||||
*
|
||||
@@ -2865,6 +2825,10 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean supportsAdaptiveIconAnimation(View clickedView) {
|
||||
return false;
|
||||
}
|
||||
|
||||
public DragOptions getDefaultWorkspaceDragOptions() {
|
||||
return new DragOptions();
|
||||
}
|
||||
|
||||
@@ -1,91 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.launcher3;
|
||||
|
||||
import android.app.ActivityOptions;
|
||||
import android.content.Context;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.view.View;
|
||||
|
||||
import com.android.launcher3.util.ResourceBasedOverride;
|
||||
|
||||
/**
|
||||
* Manages the opening and closing app transitions from Launcher.
|
||||
*/
|
||||
public class LauncherAppTransitionManager implements ResourceBasedOverride {
|
||||
|
||||
public static LauncherAppTransitionManager newInstance(Context context) {
|
||||
return Overrides.getObject(LauncherAppTransitionManager.class,
|
||||
context, R.string.app_transition_manager_class);
|
||||
}
|
||||
|
||||
public ActivityOptions getActivityLaunchOptions(Launcher launcher, View v) {
|
||||
int left = 0, top = 0;
|
||||
int width = v.getMeasuredWidth(), height = v.getMeasuredHeight();
|
||||
if (v instanceof BubbleTextView) {
|
||||
// Launch from center of icon, not entire view
|
||||
Drawable icon = ((BubbleTextView) v).getIcon();
|
||||
if (icon != null) {
|
||||
Rect bounds = icon.getBounds();
|
||||
left = (width - bounds.width()) / 2;
|
||||
top = v.getPaddingTop();
|
||||
width = bounds.width();
|
||||
height = bounds.height();
|
||||
}
|
||||
}
|
||||
return ActivityOptions.makeClipRevealAnimation(v, left, top, width, height);
|
||||
}
|
||||
|
||||
public boolean supportsAdaptiveIconAnimation(View clickedView) {
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers remote animations for certain system transitions.
|
||||
*/
|
||||
public void registerRemoteAnimations() {
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles clean up when activity is destroyed.
|
||||
*/
|
||||
public void onActivityDestroyed() {
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
/**
|
||||
* Unregisters all remote animations.
|
||||
*/
|
||||
public void unregisterRemoteAnimations() {
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers remote transitions for certain system transitions.
|
||||
*/
|
||||
public void registerRemoteTransitions() {
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
/**
|
||||
* Unregisters all remote transitions.
|
||||
*/
|
||||
public void unregisterRemoteTransitions() {
|
||||
// Do nothing
|
||||
}
|
||||
}
|
||||
@@ -33,7 +33,6 @@ import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.android.launcher3.Launcher.OnResumeCallback;
|
||||
import com.android.launcher3.config.FeatureFlags;
|
||||
import com.android.launcher3.dragndrop.DragOptions;
|
||||
import com.android.launcher3.logging.FileLog;
|
||||
@@ -228,7 +227,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
|
||||
DeferredOnComplete deferred = (DeferredOnComplete) d.dragSource;
|
||||
if (target != null) {
|
||||
deferred.mPackageName = target.getPackageName();
|
||||
mLauncher.addOnResumeCallback(deferred);
|
||||
mLauncher.addOnResumeCallback(deferred::onLauncherResume);
|
||||
} else {
|
||||
deferred.sendFailure();
|
||||
}
|
||||
@@ -311,7 +310,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
|
||||
* A wrapper around {@link DragSource} which delays the {@link #onDropCompleted} action until
|
||||
* {@link #onLauncherResume}
|
||||
*/
|
||||
private class DeferredOnComplete implements DragSource, OnResumeCallback {
|
||||
private class DeferredOnComplete implements DragSource {
|
||||
|
||||
private final DragSource mOriginal;
|
||||
private final Context mContext;
|
||||
@@ -330,7 +329,6 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
|
||||
mDragObject = d;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLauncherResume() {
|
||||
// We use MATCH_UNINSTALLED_PACKAGES as the app can be on SD card as well.
|
||||
if (new PackageManagerHelper(mContext).getApplicationInfo(mPackageName,
|
||||
|
||||
@@ -186,7 +186,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
|
||||
@Thunk final Launcher mLauncher;
|
||||
@Thunk DragController mDragController;
|
||||
|
||||
private final Rect mTempRect = new Rect();
|
||||
private final int[] mTempXY = new int[2];
|
||||
private final float[] mTempFXY = new float[2];
|
||||
@Thunk float[] mDragViewVisualCenter = new float[2];
|
||||
@@ -367,10 +366,19 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
|
||||
}
|
||||
|
||||
public float getWallpaperOffsetForCenterPage() {
|
||||
int pageScroll = getScrollForPage(getPageNearestToCenterOfScreen());
|
||||
return getWallpaperOffsetForPage(getPageNearestToCenterOfScreen());
|
||||
}
|
||||
|
||||
private float getWallpaperOffsetForPage(int page) {
|
||||
int pageScroll = getScrollForPage(page);
|
||||
return mWallpaperOffset.wallpaperOffsetForScroll(pageScroll);
|
||||
}
|
||||
|
||||
/** Returns the number of pages used for the wallpaper parallax. */
|
||||
public int getNumPagesForWallpaperParallax() {
|
||||
return mWallpaperOffset.getNumPagesForWallpaperParallax();
|
||||
}
|
||||
|
||||
public Rect estimateItemPosition(CellLayout cl, int hCell, int vCell, int hSpan, int vSpan) {
|
||||
Rect r = new Rect();
|
||||
cl.cellToRect(hCell, vCell, hSpan, vSpan, r);
|
||||
|
||||
@@ -17,7 +17,6 @@ package com.android.launcher3.secondarydisplay;
|
||||
|
||||
import android.animation.Animator;
|
||||
import android.animation.AnimatorListenerAdapter;
|
||||
import android.app.ActivityOptions;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
@@ -167,11 +166,6 @@ public class SecondaryDisplayLauncher extends BaseDraggingActivity
|
||||
return mDragLayer;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ActivityOptions getActivityLaunchOptions(View v) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void reapplyUi() { }
|
||||
|
||||
|
||||
@@ -88,7 +88,6 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat {
|
||||
private PreferenceCategory mPluginsCategory;
|
||||
private FlagTogglerPrefUi mFlagTogglerPrefUi;
|
||||
|
||||
|
||||
@Override
|
||||
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
|
||||
IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
|
||||
|
||||
@@ -180,7 +180,7 @@ public class ItemClickHandler {
|
||||
LauncherApps launcherApps = launcher.getSystemService(LauncherApps.class);
|
||||
try {
|
||||
launcherApps.startPackageInstallerSessionDetailsActivity(sessionInfo, null,
|
||||
launcher.getActivityLaunchOptionsAsBundle(v));
|
||||
launcher.getActivityLaunchOptions(v).toBundle());
|
||||
return;
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "Unable to launch market intent for package=" + packageName, e);
|
||||
@@ -304,7 +304,7 @@ public class ItemClickHandler {
|
||||
intent.setPackage(null);
|
||||
}
|
||||
}
|
||||
if (v != null && launcher.getAppTransitionManager().supportsAdaptiveIconAnimation(v)) {
|
||||
if (v != null && launcher.supportsAdaptiveIconAnimation(v)) {
|
||||
// Preload the icon to reduce latency b/w swapping the floating view with the original.
|
||||
FloatingIconView.fetchIcon(launcher, v, item, true /* isOpening */);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.launcher3.util;
|
||||
|
||||
|
||||
import android.app.ActivityOptions;
|
||||
import android.os.Bundle;
|
||||
|
||||
/**
|
||||
* A wrapper around {@link ActivityOptions} to allow custom functionality in launcher
|
||||
*/
|
||||
public class ActivityOptionsWrapper {
|
||||
|
||||
public final ActivityOptions options;
|
||||
public final RunnableList onEndCallback;
|
||||
|
||||
public ActivityOptionsWrapper(ActivityOptions options, RunnableList onEndCallback) {
|
||||
this.options = options;
|
||||
this.onEndCallback = onEndCallback;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see {@link ActivityOptions#toBundle()}
|
||||
*/
|
||||
public Bundle toBundle() {
|
||||
return options.toBundle();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.launcher3.util;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* Utility class to hold a list of runnable
|
||||
*/
|
||||
public class RunnableList {
|
||||
|
||||
private ArrayList<Runnable> mList = null;
|
||||
private boolean mDestroyed = false;
|
||||
|
||||
/**
|
||||
* Ads a runnable to this list
|
||||
*/
|
||||
public void add(Runnable runnable) {
|
||||
if (mDestroyed) {
|
||||
runnable.run();
|
||||
return;
|
||||
}
|
||||
if (mList == null) {
|
||||
mList = new ArrayList<>();
|
||||
}
|
||||
mList.add(runnable);
|
||||
}
|
||||
|
||||
/**
|
||||
* Destroys the list, executing any pending callbacks. All new callbacks are
|
||||
* immediately executed
|
||||
*/
|
||||
public void executeAllAndDestroy() {
|
||||
mDestroyed = true;
|
||||
executeAllAndClear();
|
||||
}
|
||||
|
||||
/**
|
||||
* Executes all previously added runnable and clears the list
|
||||
*/
|
||||
public void executeAllAndClear() {
|
||||
if (mList != null) {
|
||||
ArrayList<Runnable> list = mList;
|
||||
mList = null;
|
||||
int count = list.size();
|
||||
for (int i = 0; i < count; i++) {
|
||||
list.get(i).run();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -145,14 +145,17 @@ public class WallpaperOffsetInterpolator extends BroadcastReceiver {
|
||||
msg.sendToTarget();
|
||||
}
|
||||
|
||||
private void updateOffset() {
|
||||
int numPagesForWallpaperParallax;
|
||||
/** Returns the number of pages used for the wallpaper parallax. */
|
||||
public int getNumPagesForWallpaperParallax() {
|
||||
if (mWallpaperIsLiveWallpaper) {
|
||||
numPagesForWallpaperParallax = mNumScreens;
|
||||
return mNumScreens;
|
||||
} else {
|
||||
numPagesForWallpaperParallax = Math.max(MIN_PARALLAX_PAGE_SPAN, mNumScreens);
|
||||
return Math.max(MIN_PARALLAX_PAGE_SPAN, mNumScreens);
|
||||
}
|
||||
Message.obtain(mHandler, MSG_SET_NUM_PARALLAX, numPagesForWallpaperParallax, 0,
|
||||
}
|
||||
|
||||
private void updateOffset() {
|
||||
Message.obtain(mHandler, MSG_SET_NUM_PARALLAX, getNumPagesForWallpaperParallax(), 0,
|
||||
mWindowToken).sendToTarget();
|
||||
}
|
||||
|
||||
|
||||
@@ -74,7 +74,18 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
|
||||
|
||||
@Override
|
||||
public final void onClick(View v) {
|
||||
mWidgetInstructionToast = showWidgetToast(getContext(), mWidgetInstructionToast);
|
||||
Object tag = null;
|
||||
if (v instanceof WidgetCell) {
|
||||
tag = v.getTag();
|
||||
} else if (v.getParent() instanceof WidgetCell) {
|
||||
tag = ((WidgetCell) v.getParent()).getTag();
|
||||
}
|
||||
if (tag instanceof PendingAddShortcutInfo) {
|
||||
mWidgetInstructionToast = showShortcutToast(getContext(), mWidgetInstructionToast);
|
||||
} else {
|
||||
mWidgetInstructionToast = showWidgetToast(getContext(), mWidgetInstructionToast);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -158,4 +169,21 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView
|
||||
toast.show();
|
||||
return toast;
|
||||
}
|
||||
|
||||
/**
|
||||
* Show shortcut tap toast prompting user to drag instead.
|
||||
*/
|
||||
private static Toast showShortcutToast(Context context, Toast toast) {
|
||||
// Let the user know that they have to long press to add a widget
|
||||
if (toast != null) {
|
||||
toast.cancel();
|
||||
}
|
||||
|
||||
CharSequence msg = Utilities.wrapForTts(
|
||||
context.getText(R.string.long_press_shortcut_to_add),
|
||||
context.getString(R.string.long_accessible_way_to_add_shortcut));
|
||||
toast = Toast.makeText(context, msg, Toast.LENGTH_SHORT);
|
||||
toast.show();
|
||||
return toast;
|
||||
}
|
||||
}
|
||||
@@ -16,12 +16,17 @@
|
||||
|
||||
package com.android.launcher3.widget;
|
||||
|
||||
import android.app.WallpaperManager;
|
||||
import android.appwidget.AppWidgetProviderInfo;
|
||||
import android.content.Context;
|
||||
import android.content.res.Configuration;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.RectF;
|
||||
import android.os.Handler;
|
||||
import android.os.SystemClock;
|
||||
import android.util.Log;
|
||||
import android.util.SparseBooleanArray;
|
||||
import android.util.SparseIntArray;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
@@ -32,10 +37,13 @@ import android.widget.AdapterView;
|
||||
import android.widget.Advanceable;
|
||||
import android.widget.RemoteViews;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.android.launcher3.CheckLongPressHelper;
|
||||
import com.android.launcher3.Launcher;
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.Utilities;
|
||||
import com.android.launcher3.Workspace;
|
||||
import com.android.launcher3.dragndrop.DragLayer;
|
||||
import com.android.launcher3.model.data.ItemInfo;
|
||||
import com.android.launcher3.model.data.LauncherAppWidgetInfo;
|
||||
@@ -43,11 +51,16 @@ import com.android.launcher3.util.Executors;
|
||||
import com.android.launcher3.util.Themes;
|
||||
import com.android.launcher3.views.BaseDragLayer.TouchCompleteListener;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
|
||||
implements TouchCompleteListener, View.OnLongClickListener {
|
||||
implements TouchCompleteListener, View.OnLongClickListener,
|
||||
LocalColorExtractor.Listener {
|
||||
|
||||
private static final String LOG_TAG = "LauncherAppWidgetHostView";
|
||||
|
||||
// Related to the auto-advancing of widgets
|
||||
private static final long ADVANCE_INTERVAL = 20000;
|
||||
@@ -60,18 +73,29 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
|
||||
|
||||
private final CheckLongPressHelper mLongPressHelper;
|
||||
protected final Launcher mLauncher;
|
||||
private final Workspace mWorkspace;
|
||||
private final WallpaperManager mWallpaperManager;
|
||||
|
||||
@ViewDebug.ExportedProperty(category = "launcher")
|
||||
private boolean mReinflateOnConfigChange;
|
||||
|
||||
// Maintain the color manager.
|
||||
private final LocalColorExtractor mColorExtractor;
|
||||
|
||||
private boolean mIsScrollable;
|
||||
private boolean mIsAttachedToWindow;
|
||||
private boolean mIsAutoAdvanceRegistered;
|
||||
private Runnable mAutoAdvanceRunnable;
|
||||
private RectF mLastLocationRegistered = null;
|
||||
// Used to store the widget size during onLayout.
|
||||
private final Rect mCurrentWidgetSize = new Rect();
|
||||
private final RectF mTempRectF = new RectF();
|
||||
private final boolean mIsRtl;
|
||||
|
||||
public LauncherAppWidgetHostView(Context context) {
|
||||
super(context);
|
||||
mLauncher = Launcher.getLauncher(context);
|
||||
mWorkspace = mLauncher.getWorkspace();
|
||||
mLongPressHelper = new CheckLongPressHelper(this, this);
|
||||
mInflater = LayoutInflater.from(context);
|
||||
setAccessibilityDelegate(mLauncher.getAccessibilityDelegate());
|
||||
@@ -81,6 +105,19 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
|
||||
if (Utilities.ATLEAST_Q && Themes.getAttrBoolean(mLauncher, R.attr.isWorkspaceDarkText)) {
|
||||
setOnLightBackground(true);
|
||||
}
|
||||
mIsRtl = Utilities.isRtl(context.getResources());
|
||||
mWallpaperManager = WallpaperManager.getInstance(getContext());
|
||||
mColorExtractor = LocalColorExtractor.newInstance(getContext());
|
||||
mColorExtractor.setListener(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setColorResources(@Nullable SparseIntArray colors) {
|
||||
if (colors == null) {
|
||||
resetColorResources();
|
||||
} else {
|
||||
super.setColorResources(colors);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -167,6 +204,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
|
||||
// state is updated. So isAttachedToWindow() will return true until next frame.
|
||||
mIsAttachedToWindow = false;
|
||||
checkIfAutoAdvance();
|
||||
mColorExtractor.removeLocations();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -213,6 +251,78 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
|
||||
}
|
||||
|
||||
mIsScrollable = checkScrollableRecursively(this);
|
||||
|
||||
mCurrentWidgetSize.left = left;
|
||||
mCurrentWidgetSize.top = top;
|
||||
mCurrentWidgetSize.right = right;
|
||||
mCurrentWidgetSize.bottom = bottom;
|
||||
updateColorExtraction(mCurrentWidgetSize);
|
||||
}
|
||||
|
||||
private void updateColorExtraction(Rect widgetLocation) {
|
||||
// If the widget hasn't been measured and laid out, we cannot do this.
|
||||
if (widgetLocation.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
|
||||
if (info != null) {
|
||||
int screenWidth = mLauncher.getDeviceProfile().widthPx;
|
||||
int screenHeight = mLauncher.getDeviceProfile().heightPx;
|
||||
int numScreens = mWorkspace.getNumPagesForWallpaperParallax();
|
||||
int screenId = mIsRtl ? numScreens - info.screenId : info.screenId;
|
||||
float relativeScreenWidth = 1f / numScreens;
|
||||
float absoluteTop = widgetLocation.top;
|
||||
float absoluteBottom = widgetLocation.bottom;
|
||||
for (View v = (View) getParent();
|
||||
v != null && v.getId() != R.id.launcher;
|
||||
v = (View) v.getParent()) {
|
||||
absoluteBottom += v.getTop();
|
||||
absoluteTop += v.getTop();
|
||||
}
|
||||
float xOffset = 0;
|
||||
View parentView = (View) getParent();
|
||||
// The layout depends on the orientation.
|
||||
if (getResources().getConfiguration().orientation
|
||||
== Configuration.ORIENTATION_LANDSCAPE) {
|
||||
xOffset = screenHeight - mWorkspace.getPaddingRight()
|
||||
- parentView.getWidth();
|
||||
} else {
|
||||
xOffset = mWorkspace.getPaddingLeft() + parentView.getPaddingLeft();
|
||||
}
|
||||
// This is the position of the widget relative to the wallpaper, as expected by the
|
||||
// local color extraction of the WallpaperManager.
|
||||
// The coordinate system is such that, on the horizontal axis, each screen has a
|
||||
// distinct range on the [0,1] segment. So if there are 3 screens, they will have the
|
||||
// ranges [0, 1/3], [1/3, 2/3] and [2/3, 1]. The position on the subrange should be
|
||||
// the position of the widget relative to the screen. For the vertical axis, this is
|
||||
// simply the location of the widget relative to the screen.
|
||||
mTempRectF.left = ((widgetLocation.left + xOffset) / screenWidth + screenId)
|
||||
* relativeScreenWidth;
|
||||
mTempRectF.right = ((widgetLocation.right + xOffset) / screenWidth + screenId)
|
||||
* relativeScreenWidth;
|
||||
mTempRectF.top = absoluteTop / screenHeight;
|
||||
mTempRectF.bottom = absoluteBottom / screenHeight;
|
||||
if (mTempRectF.left < 0 || mTempRectF.right > 1 || mTempRectF.top < 0
|
||||
|| mTempRectF.bottom > 1) {
|
||||
Log.e(LOG_TAG, " Error, invalid relative position");
|
||||
return;
|
||||
}
|
||||
if (!mTempRectF.equals(mLastLocationRegistered)) {
|
||||
if (mLastLocationRegistered != null) {
|
||||
mColorExtractor.removeLocations();
|
||||
}
|
||||
mLastLocationRegistered = new RectF(mTempRectF);
|
||||
mColorExtractor.addLocation(List.of(mLastLocationRegistered));
|
||||
}
|
||||
} else {
|
||||
mColorExtractor.removeLocations();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onColorsChanged(RectF rectF, SparseIntArray colors) {
|
||||
// setColorResources will reapply the view, which must happen in the UI thread.
|
||||
post(() -> setColorResources(colors));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -225,6 +335,14 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
|
||||
protected void onWindowVisibilityChanged(int visibility) {
|
||||
super.onWindowVisibilityChanged(visibility);
|
||||
maybeRegisterAutoAdvance();
|
||||
|
||||
if (visibility == View.VISIBLE) {
|
||||
if (mLastLocationRegistered != null) {
|
||||
mColorExtractor.addLocation(List.of(mLastLocationRegistered));
|
||||
}
|
||||
} else {
|
||||
mColorExtractor.removeLocations();
|
||||
}
|
||||
}
|
||||
|
||||
private void checkIfAutoAdvance() {
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
/*
|
||||
* Copyright (C) 2009 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.launcher3.widget;
|
||||
|
||||
import android.appwidget.AppWidgetHostView;
|
||||
import android.content.Context;
|
||||
import android.graphics.RectF;
|
||||
import android.util.SparseIntArray;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.util.ResourceBasedOverride;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/** Extracts the colors we need from the wallpaper at given locations. */
|
||||
public class LocalColorExtractor implements ResourceBasedOverride {
|
||||
|
||||
/** Listener for color changes on a screen location. */
|
||||
public interface Listener {
|
||||
/**
|
||||
* Method called when the colors on a registered location has changed.
|
||||
*
|
||||
* {@code extractedColors} maps the color resources {@code android.R.colors.system_*} to
|
||||
* their value, in a format that can be passed directly to
|
||||
* {@link AppWidgetHostView#setColorResources(SparseIntArray)}.
|
||||
*/
|
||||
void onColorsChanged(RectF rect, SparseIntArray extractedColors);
|
||||
}
|
||||
|
||||
static LocalColorExtractor newInstance(Context context) {
|
||||
return Overrides.getObject(LocalColorExtractor.class, context.getApplicationContext(),
|
||||
R.string.local_colors_extraction_class);
|
||||
}
|
||||
|
||||
/** Sets the object that will receive the color changes. */
|
||||
public void setListener(@Nullable Listener listener) {
|
||||
// no-op
|
||||
}
|
||||
|
||||
/** Adds a list of locations to track with this listener. */
|
||||
public void addLocation(List<RectF> locations) {
|
||||
// no-op
|
||||
}
|
||||
|
||||
/** Stops tracking any locations. */
|
||||
public void removeLocations() {
|
||||
// no-op
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.launcher3.widget.picker.search;
|
||||
|
||||
import android.os.Handler;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.launcher3.search.SearchAlgorithm;
|
||||
import com.android.launcher3.search.SearchCallback;
|
||||
import com.android.launcher3.widget.model.WidgetsListBaseEntry;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* Implementation of {@link SearchAlgorithm} that posts a task to query on the main thread.
|
||||
*/
|
||||
public final class SimpleWidgetsSearchAlgorithm implements SearchAlgorithm<WidgetsListBaseEntry> {
|
||||
|
||||
private static final boolean DEBUG = false;
|
||||
private static final String TAG = "SimpleWidgetsSearchAlgo";
|
||||
private static final String DELIM = "\t";
|
||||
|
||||
private final Handler mResultHandler;
|
||||
private final WidgetsPickerSearchPipeline mSearchPipeline;
|
||||
|
||||
public SimpleWidgetsSearchAlgorithm(WidgetsPickerSearchPipeline searchPipeline) {
|
||||
mResultHandler = new Handler();
|
||||
mSearchPipeline = searchPipeline;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doSearch(String query, SearchCallback<WidgetsListBaseEntry> callback) {
|
||||
long startTime = System.currentTimeMillis();
|
||||
String queryToken = query + DELIM + startTime;
|
||||
if (DEBUG) {
|
||||
Log.d(TAG, "doSearch queryToken:" + queryToken);
|
||||
}
|
||||
mSearchPipeline.query(query,
|
||||
results -> mResultHandler.post(
|
||||
() -> callback.onSearchResult(queryToken, new ArrayList(results))));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cancel(boolean interruptActiveRequests) {
|
||||
if (interruptActiveRequests) {
|
||||
mResultHandler.removeCallbacksAndMessages(/*token= */null);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.launcher3.widget.picker.search;
|
||||
|
||||
import com.android.launcher3.widget.model.WidgetsListBaseEntry;
|
||||
|
||||
import java.text.Collator;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
/**
|
||||
* Implementation of {@link WidgetsPickerSearchPipeline} that performs search by prefix matching on
|
||||
* app names and widget labels.
|
||||
*/
|
||||
public final class SimpleWidgetsSearchPipeline implements WidgetsPickerSearchPipeline {
|
||||
|
||||
private final List<WidgetsListBaseEntry> mAllEntries;
|
||||
|
||||
public SimpleWidgetsSearchPipeline(List<WidgetsListBaseEntry> allEntries) {
|
||||
mAllEntries = allEntries;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void query(String input, Consumer<List<WidgetsListBaseEntry>> callback) {
|
||||
StringMatcher matcher = StringMatcher.getInstance();
|
||||
ArrayList<WidgetsListBaseEntry> results = new ArrayList<>();
|
||||
// TODO(b/157286785): Filter entries based on query prefix matching on widget labels also.
|
||||
for (WidgetsListBaseEntry e : mAllEntries) {
|
||||
if (matcher.matches(input, e.mPkgItem.title.toString())) {
|
||||
results.add(e);
|
||||
}
|
||||
}
|
||||
callback.accept(results);
|
||||
}
|
||||
|
||||
/**
|
||||
* Performs locale sensitive string comparison using {@link Collator}.
|
||||
*/
|
||||
public static class StringMatcher {
|
||||
|
||||
private static final char MAX_UNICODE = '\uFFFF';
|
||||
|
||||
private final Collator mCollator;
|
||||
|
||||
StringMatcher() {
|
||||
mCollator = Collator.getInstance();
|
||||
mCollator.setStrength(Collator.PRIMARY);
|
||||
mCollator.setDecomposition(Collator.CANONICAL_DECOMPOSITION);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if {@param query} is a prefix of {@param target}.
|
||||
*/
|
||||
public boolean matches(String query, String target) {
|
||||
switch (mCollator.compare(query, target)) {
|
||||
case 0:
|
||||
return true;
|
||||
case -1:
|
||||
// The target string can contain a modifier which would make it larger than
|
||||
// the query string (even though the length is same). If the query becomes
|
||||
// larger after appending a unicode character, it was originally a prefix of
|
||||
// the target string and hence should match.
|
||||
return mCollator.compare(query + MAX_UNICODE, target) > -1;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public static StringMatcher getInstance() {
|
||||
return new StringMatcher();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -60,6 +60,17 @@
|
||||
android:resource="@xml/appwidget_with_config"/>
|
||||
</receiver>
|
||||
|
||||
<receiver
|
||||
android:name="com.android.launcher3.testcomponent.AppWidgetDynamicColors"
|
||||
android:exported="true"
|
||||
android:label="Dynamic Colors">
|
||||
<intent-filter>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
||||
</intent-filter>
|
||||
<meta-data android:name="android.appwidget.provider"
|
||||
android:resource="@xml/appwidget_dynamic_colors"/>
|
||||
</receiver>
|
||||
|
||||
<activity
|
||||
android:name="com.android.launcher3.testcomponent.WidgetConfigActivity"
|
||||
android:exported="true">
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:background="?android:attr/colorBackground"
|
||||
android:padding="8dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<LinearLayout
|
||||
android:orientation = "horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="prim"/>
|
||||
<ImageView
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:background="@android:color/system_primary_500"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:orientation = "horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="second"/>
|
||||
<ImageView
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:background="@android:color/system_secondary_500"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:orientation = "horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="neutral"/>
|
||||
<ImageView
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:background="@android:color/system_neutral_500"/>
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<appwidget-provider
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:minWidth="1dp"
|
||||
android:minHeight="1dp"
|
||||
android:updatePeriodMillis="0"
|
||||
android:initialLayout="@layout/test_layout_appwidget_dynamic_colors"
|
||||
android:resizeMode="horizontal|vertical"
|
||||
android:widgetCategory="home_screen">
|
||||
</appwidget-provider>
|
||||
@@ -0,0 +1,25 @@
|
||||
/*
|
||||
* Copyright (C) 2013 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.launcher3.testcomponent;
|
||||
|
||||
import android.appwidget.AppWidgetProvider;
|
||||
|
||||
/**
|
||||
* A simple app widget showing a primary, secondary and neutral color.
|
||||
*/
|
||||
public class AppWidgetDynamicColors extends AppWidgetProvider {
|
||||
}
|
||||
Reference in new issue
Block a user