Snap for 8071527 from f6086e74e3
to sc-d2-release
Change-Id: I9c05e94420eb8a6dd2e64f463868b423723b2310
This commit is contained in:
commit
877df0d530
|
@ -20,6 +20,7 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
|
||||||
import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
|
import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
|
||||||
import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
|
import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
|
||||||
|
|
||||||
|
import android.annotation.Nullable;
|
||||||
import android.annotation.TargetApi;
|
import android.annotation.TargetApi;
|
||||||
import android.app.ActivityManager;
|
import android.app.ActivityManager;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
@ -397,11 +398,15 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
|
||||||
* while STATE_RECENTS_ANIMATION_CANCELED state is being set, and the caller is responsible for
|
* while STATE_RECENTS_ANIMATION_CANCELED state is being set, and the caller is responsible for
|
||||||
* calling {@link RecentsAnimationController#cleanupScreenshot()}.
|
* calling {@link RecentsAnimationController#cleanupScreenshot()}.
|
||||||
*/
|
*/
|
||||||
|
@Nullable
|
||||||
HashMap<Integer, ThumbnailData> consumeRecentsAnimationCanceledSnapshot() {
|
HashMap<Integer, ThumbnailData> consumeRecentsAnimationCanceledSnapshot() {
|
||||||
HashMap<Integer, ThumbnailData> data =
|
if (mRecentsAnimationCanceledSnapshots != null) {
|
||||||
new HashMap<Integer, ThumbnailData>(mRecentsAnimationCanceledSnapshots);
|
HashMap<Integer, ThumbnailData> data =
|
||||||
mRecentsAnimationCanceledSnapshots = null;
|
new HashMap<Integer, ThumbnailData>(mRecentsAnimationCanceledSnapshots);
|
||||||
return data;
|
mRecentsAnimationCanceledSnapshots = null;
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
void setSwipeUpStartTimeMs(long uptimeMs) {
|
void setSwipeUpStartTimeMs(long uptimeMs) {
|
||||||
|
|
Loading…
Reference in New Issue