diff --git a/go/quickstep/res/layout/overview_actions_container.xml b/go/quickstep/res/layout/overview_actions_container.xml index 077cfaee19..df0912478b 100644 --- a/go/quickstep/res/layout/overview_actions_container.xml +++ b/go/quickstep/res/layout/overview_actions_container.xml @@ -126,7 +126,7 @@ style="@style/GoOverviewActionButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:drawableStart="@drawable/ic_save_app_pair" + android:drawableStart="@drawable/ic_save_app_pair_up_down" android:text="@string/action_save_app_pair" android:theme="@style/ThemeControlHighlightWorkspaceColor" android:visibility="gone" /> diff --git a/quickstep/res/drawable/ic_save_app_pair.xml b/quickstep/res/drawable/ic_save_app_pair.xml deleted file mode 100644 index 4a7ee1ac70..0000000000 --- a/quickstep/res/drawable/ic_save_app_pair.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - diff --git a/quickstep/res/drawable/ic_save_app_pair_left_right.xml b/quickstep/res/drawable/ic_save_app_pair_left_right.xml new file mode 100644 index 0000000000..b104f44b76 --- /dev/null +++ b/quickstep/res/drawable/ic_save_app_pair_left_right.xml @@ -0,0 +1,28 @@ + + + + + + + diff --git a/quickstep/res/drawable/ic_save_app_pair_up_down.xml b/quickstep/res/drawable/ic_save_app_pair_up_down.xml new file mode 100644 index 0000000000..86f110ce5e --- /dev/null +++ b/quickstep/res/drawable/ic_save_app_pair_up_down.xml @@ -0,0 +1,28 @@ + + + + + + + diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java index c97e62a60a..38d11327e7 100644 --- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java +++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java @@ -136,8 +136,9 @@ public interface TaskShortcutFactory { class SaveAppPairSystemShortcut extends SystemShortcut { private final GroupedTaskView mTaskView; - public SaveAppPairSystemShortcut(BaseDraggingActivity activity, GroupedTaskView taskView) { - super(R.drawable.ic_save_app_pair, R.string.save_app_pair, activity, + public SaveAppPairSystemShortcut(BaseDraggingActivity activity, GroupedTaskView taskView, + int iconResId) { + super(iconResId, R.string.save_app_pair, activity, taskView.getItemInfo(), taskView); mTaskView = taskView; } @@ -340,8 +341,12 @@ public interface TaskShortcutFactory { return null; } + int iconResId = deviceProfile.isLeftRightSplit + ? R.drawable.ic_save_app_pair_left_right + : R.drawable.ic_save_app_pair_up_down; + return Collections.singletonList( - new SaveAppPairSystemShortcut(activity, (GroupedTaskView) taskView)); + new SaveAppPairSystemShortcut(activity, (GroupedTaskView) taskView, iconResId)); } @Override diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java index e0091a5ae2..afee706e37 100644 --- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java +++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java @@ -407,7 +407,11 @@ public class OverviewActionsView extends FrameLayo ? R.drawable.ic_split_horizontal : R.drawable.ic_split_vertical; mSplitButton.setCompoundDrawablesRelativeWithIntrinsicBounds(splitIconRes, 0, 0, 0); + + int appPairIconRes = dp.isLeftRightSplit + ? R.drawable.ic_save_app_pair_left_right + : R.drawable.ic_save_app_pair_up_down; mSaveAppPairButton.setCompoundDrawablesRelativeWithIntrinsicBounds( - R.drawable.ic_save_app_pair, 0, 0, 0); + appPairIconRes, 0, 0, 0); } }