Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-29 19:51:53 +00:00
committed by Android (Google) Code Review
parent 477b1b0361 80f7b015ca
commit c16142239f
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/recents_incompatible_app_overlay.xml
View File

@@ -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>

2
packages/SystemUI/res/values/strings.xml
View File

@@ -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>

2
packages/SystemUI/src/com/android/systemui/recents/Recents.java
View File

@@ -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 {

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

@@ -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) {