Loading quickstep/res/values/strings.xml +2 −0 Original line number Diff line number Diff line Loading @@ -193,6 +193,8 @@ <string name="action_split">Split</string> <!-- Label for toast with instructions for split screen selection mode. [CHAR_LIMIT=50] --> <string name="toast_split_select_app">Tap another app to use splitscreen</string> <!-- Label for toast when app selected for split isn't supported. [CHAR_LIMIT=50] --> <string name="toast_split_app_unsupported">App does not support split-screen.</string> <!-- Message shown when an action is blocked by a policy enforced by the app or the organization managing the device. [CHAR_LIMIT=NONE] --> <string name="blocked_by_policy">This action isn\'t allowed by the app or your organization</string> Loading quickstep/src/com/android/quickstep/views/RecentsView.java +8 −0 Original line number Diff line number Diff line Loading @@ -599,6 +599,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T private SplitConfigurationOptions.StagedSplitBounds mSplitBoundsConfig; private final Toast mSplitToast = Toast.makeText(getContext(), R.string.toast_split_select_app, Toast.LENGTH_SHORT); private final Toast mSplitUnsupportedToast = Toast.makeText(getContext(), R.string.toast_split_app_unsupported, Toast.LENGTH_SHORT); /** * Keeps track of the index of the TaskView that split screen was initialized with so we know Loading Loading @@ -3878,6 +3880,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T public void confirmSplitSelect(TaskView taskView) { mSplitToast.cancel(); if (!taskView.getTask().isDockable) { // Task not split screen supported mSplitUnsupportedToast.show(); return; } RectF secondTaskStartingBounds = new RectF(); Rect secondTaskEndingBounds = new Rect(); // TODO(194414938) starting bounds seem slightly off, investigate Loading Loading @@ -3920,6 +3927,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T int duration = mActivity.getStateManager().getState().getTransitionDuration(getContext()); PendingAnimation pendingAnim = new PendingAnimation(duration); mSplitToast.cancel(); mSplitUnsupportedToast.cancel(); if (!animate) { resetFromSplitSelectionState(); return pendingAnim; Loading Loading
quickstep/res/values/strings.xml +2 −0 Original line number Diff line number Diff line Loading @@ -193,6 +193,8 @@ <string name="action_split">Split</string> <!-- Label for toast with instructions for split screen selection mode. [CHAR_LIMIT=50] --> <string name="toast_split_select_app">Tap another app to use splitscreen</string> <!-- Label for toast when app selected for split isn't supported. [CHAR_LIMIT=50] --> <string name="toast_split_app_unsupported">App does not support split-screen.</string> <!-- Message shown when an action is blocked by a policy enforced by the app or the organization managing the device. [CHAR_LIMIT=NONE] --> <string name="blocked_by_policy">This action isn\'t allowed by the app or your organization</string> Loading
quickstep/src/com/android/quickstep/views/RecentsView.java +8 −0 Original line number Diff line number Diff line Loading @@ -599,6 +599,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T private SplitConfigurationOptions.StagedSplitBounds mSplitBoundsConfig; private final Toast mSplitToast = Toast.makeText(getContext(), R.string.toast_split_select_app, Toast.LENGTH_SHORT); private final Toast mSplitUnsupportedToast = Toast.makeText(getContext(), R.string.toast_split_app_unsupported, Toast.LENGTH_SHORT); /** * Keeps track of the index of the TaskView that split screen was initialized with so we know Loading Loading @@ -3878,6 +3880,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T public void confirmSplitSelect(TaskView taskView) { mSplitToast.cancel(); if (!taskView.getTask().isDockable) { // Task not split screen supported mSplitUnsupportedToast.show(); return; } RectF secondTaskStartingBounds = new RectF(); Rect secondTaskEndingBounds = new Rect(); // TODO(194414938) starting bounds seem slightly off, investigate Loading Loading @@ -3920,6 +3927,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T int duration = mActivity.getStateManager().getState().getTransitionDuration(getContext()); PendingAnimation pendingAnim = new PendingAnimation(duration); mSplitToast.cancel(); mSplitUnsupportedToast.cancel(); if (!animate) { resetFromSplitSelectionState(); return pendingAnim; Loading