Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce3e3f2a authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Removing duplicate string in Recents." into oc-dev 

am: c1614223

Change-Id: I7274af1f1b6670478b3bb2a848e39a42ddff639b
parents 68b9f45a c1614223

packages/SystemUI/res/layout/recents_incompatible_app_overlay.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/src/com/android/systemui/recents/Recents.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {

packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {