diff options
4 files changed, 4 insertions, 6 deletions
diff --git a/packages/SystemUI/res/layout/recents_incompatible_app_overlay.xml b/packages/SystemUI/res/layout/recents_incompatible_app_overlay.xml index d2daa89ff03b..a1c1e5bd32c7 100644 --- a/packages/SystemUI/res/layout/recents_incompatible_app_overlay.xml +++ b/packages/SystemUI/res/layout/recents_incompatible_app_overlay.xml @@ -26,6 +26,6 @@ android:layout_gravity="center" android:drawableTop="@drawable/recents_info_light" android:drawablePadding="8dp" - android:text="@string/recents_incompatible_app_message" + android:text="@string/dock_non_resizeble_failed_to_dock_text" android:textColor="@android:color/white" /> </FrameLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index bf17e387e321..4a3ce9753c32 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -789,8 +789,6 @@ <string name="recents_launch_disabled_message"><xliff:g id="app" example="Calendar">%s</xliff:g> is disabled in safe-mode.</string> <!-- Recents: Stack action button string. [CHAR LIMIT=NONE] --> <string name="recents_stack_action_button_label">Clear all</string> - <!-- Recents: Incompatible task message. [CHAR LIMIT=NONE] --> - <string name="recents_incompatible_app_message">App doesn\'t support split screen</string> <!-- Recents: Hint text that shows on the drop targets to start multiwindow. [CHAR LIMIT=NONE] --> <string name="recents_drag_hint_message">Drag here to use split screen</string> diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java index 6da827240f3a..d3bd89ff2e47 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java +++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java @@ -474,7 +474,7 @@ public class Recents extends SystemUI return true; } else { EventBus.getDefault().send(new ShowUserToastEvent( - R.string.recents_incompatible_app_message, Toast.LENGTH_SHORT)); + R.string.dock_non_resizeble_failed_to_dock_text, Toast.LENGTH_SHORT)); return false; } } else { diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java index a5f78322fca0..b8be5800764a 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java @@ -610,8 +610,8 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks if (mIncompatibleAppToastView == null) { mIncompatibleAppToastView = Utilities.findViewStubById(this, R.id.incompatible_app_toast_stub).inflate(); - TextView msg = (TextView) findViewById(com.android.internal.R.id.message); - msg.setText(R.string.recents_incompatible_app_message); + TextView msg = findViewById(com.android.internal.R.id.message); + msg.setText(R.string.dock_non_resizeble_failed_to_dock_text); } mIncompatibleAppToastView.setVisibility(View.VISIBLE); } else if (mIncompatibleAppToastView != null) { |