Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev

2016-04-07 23:40:43 +00:00
parent 8f035a3c17 d53f09254e
commit 7c3912e4ab
15 changed files with 90 additions and 139 deletions
--- a/packages/SystemUI/res/layout/forced_resizable_activity.xml
+++ b/packages/SystemUI/res/layout/forced_resizable_activity.xml
@ -22,6 +22,6 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
-        android:text="@string/forced_resizable_info_text"
+        android:text="@string/dock_forced_resizable"
        android:textColor="#ffffff"/>
 </FrameLayout>