From 455197bf417d4cfcfce0fb9911c1493b4d7f95a2 Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Wed, 1 Dec 2021 14:58:53 -0800 Subject: [PATCH] Add icons for staged split Fixes: 208649953 Change-Id: I8b7bb3a650e836608ebe6aa50631026f5f6a7c63 --- quickstep/res/layout/overview_actions_container.xml | 1 - .../android/quickstep/views/OverviewActionsView.java | 7 ++++++- res/drawable/ic_split_horizontal.xml | 9 +++++++++ res/drawable/ic_split_left.xml | 9 +++++++++ res/drawable/ic_split_right.xml | 9 +++++++++ res/drawable/ic_split_top.xml | 9 +++++++++ res/drawable/ic_split_vertical.xml | 9 +++++++++ .../launcher3/touch/LandscapePagedViewHandler.java | 2 +- .../launcher3/touch/PortraitPagedViewHandler.java | 11 +++++------ .../launcher3/touch/SeascapePagedViewHandler.java | 2 +- 10 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 res/drawable/ic_split_horizontal.xml create mode 100644 res/drawable/ic_split_left.xml create mode 100644 res/drawable/ic_split_right.xml create mode 100644 res/drawable/ic_split_top.xml create mode 100644 res/drawable/ic_split_vertical.xml diff --git a/quickstep/res/layout/overview_actions_container.xml b/quickstep/res/layout/overview_actions_container.xml index dd8afc22e0..1c7b5099a8 100644 --- a/quickstep/res/layout/overview_actions_container.xml +++ b/quickstep/res/layout/overview_actions_container.xml @@ -51,7 +51,6 @@ style="@style/OverviewActionButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:drawableStart="@drawable/ic_split_screen" android:text="@string/action_split" android:theme="@style/ThemeControlHighlightWorkspaceColor" android:visibility="gone" /> diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java index b6bf59f981..81c07a6a64 100644 --- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java +++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java @@ -22,6 +22,7 @@ import android.graphics.Rect; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; +import android.widget.Button; import android.widget.FrameLayout; import androidx.annotation.IntDef; @@ -80,7 +81,7 @@ public class OverviewActionsView extends FrameLayo private static final int INDEX_HIDDEN_FLAGS_ALPHA = 3; private final MultiValueAlpha mMultiValueAlpha; - private View mSplitButton; + private Button mSplitButton; @ActionsHiddenFlags private int mHiddenFlags; @@ -215,6 +216,10 @@ public class OverviewActionsView extends FrameLayo mDp = dp; updateVerticalMargin(SysUINavigationMode.getMode(getContext())); requestLayout(); + + mSplitButton.setCompoundDrawablesWithIntrinsicBounds( + (dp.isLandscape ? R.drawable.ic_split_horizontal : R.drawable.ic_split_vertical), + 0, 0, 0); } public void setSplitButtonVisible(boolean visible) { diff --git a/res/drawable/ic_split_horizontal.xml b/res/drawable/ic_split_horizontal.xml new file mode 100644 index 0000000000..ee710d0797 --- /dev/null +++ b/res/drawable/ic_split_horizontal.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_split_left.xml b/res/drawable/ic_split_left.xml new file mode 100644 index 0000000000..fc9f699c29 --- /dev/null +++ b/res/drawable/ic_split_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_split_right.xml b/res/drawable/ic_split_right.xml new file mode 100644 index 0000000000..cc156225e8 --- /dev/null +++ b/res/drawable/ic_split_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_split_top.xml b/res/drawable/ic_split_top.xml new file mode 100644 index 0000000000..f8c15bd44d --- /dev/null +++ b/res/drawable/ic_split_top.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_split_vertical.xml b/res/drawable/ic_split_vertical.xml new file mode 100644 index 0000000000..9bc97851ab --- /dev/null +++ b/res/drawable/ic_split_vertical.xml @@ -0,0 +1,9 @@ + + + diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java index c2552250df..0c390679d9 100644 --- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java +++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java @@ -357,7 +357,7 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { public List getSplitPositionOptions(DeviceProfile dp) { // Add "left" side of phone which is actually the top return Collections.singletonList(new SplitPositionOption( - R.drawable.ic_split_screen, R.string.split_screen_position_left, + R.drawable.ic_split_left, R.string.split_screen_position_left, STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN)); } diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java index e69944abef..b9f1b66a68 100644 --- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java +++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java @@ -370,28 +370,27 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { public List getSplitPositionOptions(DeviceProfile dp) { List options = new ArrayList<>(1); // Add both left and right options if we're in tablet mode - // TODO: Add in correct icons if (dp.isTablet && dp.isLandscape) { options.add(new SplitPositionOption( - R.drawable.ic_split_screen, R.string.split_screen_position_right, + R.drawable.ic_split_right, R.string.split_screen_position_right, STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_MAIN)); options.add(new SplitPositionOption( - R.drawable.ic_split_screen, R.string.split_screen_position_left, + R.drawable.ic_split_left, R.string.split_screen_position_left, STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN)); } else { if (dp.isSeascape()) { // Add left/right options options.add(new SplitPositionOption( - R.drawable.ic_split_screen, R.string.split_screen_position_right, + R.drawable.ic_split_right, R.string.split_screen_position_right, STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_MAIN)); } else if (dp.isLandscape) { options.add(new SplitPositionOption( - R.drawable.ic_split_screen, R.string.split_screen_position_left, + R.drawable.ic_split_left, R.string.split_screen_position_left, STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN)); } else { // Only add top option options.add(new SplitPositionOption( - R.drawable.ic_split_screen, R.string.split_screen_position_top, + R.drawable.ic_split_top, R.string.split_screen_position_top, STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN)); } } diff --git a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java index 539e3f82c5..ce2e13644d 100644 --- a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java +++ b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java @@ -115,7 +115,7 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler { public List getSplitPositionOptions(DeviceProfile dp) { // Add "right" option which is actually the top return Collections.singletonList(new SplitPositionOption( - R.drawable.ic_split_screen, R.string.split_screen_position_right, + R.drawable.ic_split_right, R.string.split_screen_position_right, STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN)); }