diff --git a/go/quickstep/res/layout/overview_actions_container.xml b/go/quickstep/res/layout/overview_actions_container.xml index 196541f0a9..48650aac20 100644 --- a/go/quickstep/res/layout/overview_actions_container.xml +++ b/go/quickstep/res/layout/overview_actions_container.xml @@ -109,7 +109,7 @@ style="@style/GoOverviewActionButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:drawableStart="@drawable/ic_split_screen" + android:drawableStart="@drawable/ic_split_vertical" android:text="@string/action_split" android:theme="@style/ThemeControlHighlightWorkspaceColor" android:visibility="gone" /> diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml index 14fc94a960..a82fee869c 100644 --- a/quickstep/res/values/strings.xml +++ b/quickstep/res/values/strings.xml @@ -215,7 +215,7 @@ Split - Tap another app to use splitscreen + Tap another app to use split screen Choose another app to use split screen diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java index 663525d0c5..e58845a231 100644 --- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java +++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java @@ -296,7 +296,8 @@ public interface TaskShortcutFactory { return null; } - return Collections.singletonList(new FreeformSystemShortcut(R.drawable.ic_split_screen, + return Collections.singletonList(new FreeformSystemShortcut( + R.drawable.ic_caption_desktop_button_foreground, R.string.recent_task_option_freeform, activity, taskContainer, LAUNCHER_SYSTEM_SHORTCUT_FREE_FORM_TAP)); } diff --git a/res/drawable/ic_caption_desktop_button_foreground.xml b/res/drawable/ic_caption_desktop_button_foreground.xml new file mode 100644 index 0000000000..f185436dcf --- /dev/null +++ b/res/drawable/ic_caption_desktop_button_foreground.xml @@ -0,0 +1,33 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_split_left.xml b/res/drawable/ic_split_left.xml deleted file mode 100644 index fc9f699c29..0000000000 --- a/res/drawable/ic_split_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_split_right.xml b/res/drawable/ic_split_right.xml deleted file mode 100644 index cc156225e8..0000000000 --- a/res/drawable/ic_split_right.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_split_screen.xml b/res/drawable/ic_split_screen.xml deleted file mode 100644 index 108006929c..0000000000 --- a/res/drawable/ic_split_screen.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - diff --git a/res/drawable/ic_split_top.xml b/res/drawable/ic_split_top.xml deleted file mode 100644 index f8c15bd44d..0000000000 --- a/res/drawable/ic_split_top.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/values/strings.xml b/res/values/strings.xml index 3eb08bada1..a2ebf16b42 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -40,9 +40,6 @@ Split screen - Split top - Split left - Split right App info for %1$s diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index d7e84f0306..bd9493b271 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -85,7 +85,7 @@ import com.android.launcher3.views.BaseDragLayer; import com.android.launcher3.widget.PendingAddShortcutInfo; import java.lang.reflect.Method; -import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.regex.Matcher; @@ -691,37 +691,16 @@ public final class Utilities { /** * Returns a list of screen-splitting options depending on the device orientation (split top for - * portrait, split left for landscape, split left and right for landscape tablets, etc.) + * portrait, split right for landscape) */ public static List getSplitPositionOptions( DeviceProfile dp) { - List options = new ArrayList<>(); - // Add both left and right options if we're in tablet mode - if (dp.isTablet && dp.isLandscape) { - options.add(new SplitPositionOption( - R.drawable.ic_split_left, R.string.split_screen_position_left, - STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN)); - options.add(new SplitPositionOption( - R.drawable.ic_split_right, R.string.split_screen_position_right, - STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_MAIN)); - } else { - if (dp.isSeascape()) { - // Add left/right options - options.add(new SplitPositionOption( - 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_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_top, R.string.split_screen_position_top, - STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN)); - } - } - return options; + return Collections.singletonList(new SplitPositionOption( + dp.isLandscape ? R.drawable.ic_split_horizontal : R.drawable.ic_split_vertical, + R.string.recent_task_option_split_screen, + dp.isLandscape ? STAGE_POSITION_BOTTOM_OR_RIGHT : STAGE_POSITION_TOP_OR_LEFT, + STAGE_TYPE_MAIN + )); } /** Logs the Scale and Translate properties of a matrix. Ignores skew and perspective. */ diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java index 097823b078..cf470f426e 100644 --- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java +++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java @@ -403,7 +403,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_left, R.string.split_screen_position_left, + R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen, 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 316cf0eab1..75378f6af5 100644 --- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java +++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java @@ -30,6 +30,7 @@ import static com.android.launcher3.touch.SingleAxisSwipeDetector.VERTICAL; import static com.android.launcher3.util.NavigationMode.THREE_BUTTONS; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT; +import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN; import android.content.res.Resources; import android.graphics.Matrix; @@ -57,6 +58,7 @@ import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; import com.android.launcher3.util.SplitConfigurationOptions.StagePosition; +import java.util.ArrayList; import java.util.List; public class PortraitPagedViewHandler implements PagedOrientationHandler { @@ -405,7 +407,26 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { @Override public List getSplitPositionOptions(DeviceProfile dp) { - return Utilities.getSplitPositionOptions(dp); + if (dp.isTablet) { + return Utilities.getSplitPositionOptions(dp); + } + + List options = new ArrayList<>(); + if (dp.isSeascape()) { + options.add(new SplitPositionOption( + R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen, + STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_MAIN)); + } else if (dp.isLandscape) { + options.add(new SplitPositionOption( + R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen, + STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN)); + } else { + // Only add top option + options.add(new SplitPositionOption( + R.drawable.ic_split_vertical, R.string.recent_task_option_split_screen, + STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN)); + } + return options; } @Override diff --git a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java index 05683bd11b..33634438af 100644 --- a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java +++ b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java @@ -178,7 +178,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_right, R.string.split_screen_position_right, + R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen, STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_MAIN)); }