aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-17 09:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Reset split selection state when RecentsView resets" into sc-v2-dev am: 84b64d7910

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16299751

Change-Id: Id2bb37c56201df52da0be8749970b3ecd05eafdb
This commit is contained in:
TreeHugger Robot
2021-11-19 00:04:16 +00:00
committed by Automerger Merge Worker
parent 43497b5258 84b64d7910
commit 6b818deec1
4 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
View File

@@ -24,14 +24,12 @@ import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITIO
import android.app.ActivityOptions;
import android.app.ActivityThread;
import android.graphics.Rect;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.view.RemoteAnimationAdapter;
import android.view.SurfaceControl;
import android.window.TransitionInfo;
import com.android.launcher3.Utilities;
import com.android.launcher3.util.SplitConfigurationOptions;
import com.android.launcher3.util.SplitConfigurationOptions.StagePosition;
import com.android.quickstep.SystemUiProxy;

1
quickstep/src/com/android/quickstep/views/FloatingTaskView.java
View File

@@ -71,7 +71,6 @@ public class FloatingTaskView extends FrameLayout {
mImageView.setLayerType(LAYER_TYPE_HARDWARE, null);
mSplitPlaceholderView = findViewById(R.id.split_placeholder);
mSplitPlaceholderView.setAlpha(0);
mSplitPlaceholderView.setBackgroundColor(getResources().getColor(android.R.color.white));
}
public static FloatingTaskView getFloatingTaskView(StatefulActivity launcher,

1
quickstep/src/com/android/quickstep/views/RecentsView.java
View File

@@ -1897,6 +1897,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
remoteTargetHandle.getTransformParams().setTargetSet(null);
remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(false);
});
resetFromSplitSelectionState();
mSplitSelectStateController.resetState();
// These are relatively expensive and don't need to be done this frame (RecentsView isn't

2
res/layout/floating_split_select_view.xml
View File

@@ -14,7 +14,7 @@
android:id="@+id/split_placeholder"
android:layout_width="match_parent"
android:layout_height="@dimen/split_placeholder_size"
android:background="@android:color/white"
android:background="?android:colorPrimary"
android:visibility="gone" />
</com.android.quickstep.views.FloatingTaskView>