aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrii Kulian <akulian@google.com>2016-05-19 01:42:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-19 01:42:14 +0000
commite277ea1f64cecd5783c365c64d64b855cdfb21db (patch)
tree5ec1b4d612ec4c1f8210bae26a71c3614bee69b1
parentbcc4aec8529bb9b05b342acc83beb090456d63b3 (diff)
parent8f3a74b38fc0a191235c77701d18d8ae9ece1f92 (diff)
downloadandroid-e277ea1f64cecd5783c365c64d64b855cdfb21db.tar.gz
Merge "Rename minWidth/Height attributes" into nyc-dev
-rw-r--r--ui/window/MultiWindowPlayground/Application/src/main/AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/window/MultiWindowPlayground/Application/src/main/AndroidManifest.xml b/ui/window/MultiWindowPlayground/Application/src/main/AndroidManifest.xml
index c2429037..25b21bdf 100644
--- a/ui/window/MultiWindowPlayground/Application/src/main/AndroidManifest.xml
+++ b/ui/window/MultiWindowPlayground/Application/src/main/AndroidManifest.xml
@@ -52,8 +52,8 @@
android:defaultHeight="500dp"
android:defaultWidth="750dp"
android:gravity="top|end"
- android:minimalWidth="500dp"
- android:minimalHeight="500dp" />
+ android:minWidth="500dp"
+ android:minHeight="500dp" />
</activity>
<!-- In split-screen mode, this Activity is launched adjacent to another Activity. This is