diff --git a/packages/DocumentsUI/res/values-sw720dp/dimens.xml b/packages/DocumentsUI/res/values-sw720dp/dimens.xml
index 068c80659ab8d..4786d28342d62 100644
--- a/packages/DocumentsUI/res/values-sw720dp/dimens.xml
+++ b/packages/DocumentsUI/res/values-sw720dp/dimens.xml
@@ -18,11 +18,9 @@
     <bool name="show_as_dialog">true</bool>
 
     <item type="dimen" name="dialog_width">85%</item>
-    <item type="dimen" name="dialog_height">90%</item>
 
     <dimen name="grid_padding_horiz">24dp</dimen>
     <dimen name="grid_padding_vert">16dp</dimen>
 
     <dimen name="grid_item_padding">8dp</dimen>
-
 </resources>
diff --git a/packages/DocumentsUI/res/values-sw720dp/styles.xml b/packages/DocumentsUI/res/values-sw720dp/styles.xml
index 45ed7ad300445..0b03a94f294d0 100644
--- a/packages/DocumentsUI/res/values-sw720dp/styles.xml
+++ b/packages/DocumentsUI/res/values-sw720dp/styles.xml
@@ -16,6 +16,11 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="DialogWhenReallyLarge" parent="@*android:style/Theme.Material.DayNight.Dialog.FixedSize" />
+    <style name="DialogWhenReallyLarge" parent="@*android:style/Theme.Material.DayNight.Dialog">
+        <!-- We do not specify width of window here because the max size of
+             floating window specified by windowFixedWidthis is limited. -->
+        <item name="*android:windowFixedHeightMajor">80%</item>
+        <item name="*android:windowFixedHeightMinor">90%</item>
+    </style>
 
 </resources>
diff --git a/packages/DocumentsUI/res/values/styles.xml b/packages/DocumentsUI/res/values/styles.xml
index 45dc20b255dbb..97509f7cb0bce 100644
--- a/packages/DocumentsUI/res/values/styles.xml
+++ b/packages/DocumentsUI/res/values/styles.xml
@@ -33,13 +33,6 @@
         <item name="android:windowActionModeOverlay">true</item>
         <item name="android:windowNoTitle">true</item>
 
-        <item name="*android:windowFixedWidthMajor">@null</item>
-        <item name="*android:windowFixedWidthMinor">@null</item>
-        <item name="*android:windowMinWidthMajor">@null</item>
-        <item name="*android:windowMinWidthMinor">@null</item>
-        <item name="*android:windowFixedHeightMajor">80%</item>
-        <item name="*android:windowFixedHeightMinor">90%</item>
-
         <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
     </style>
 
diff --git a/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java
index 1a17ee01230ea..1f7b41ea7632c 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java
@@ -56,7 +56,11 @@ public class CreateDirectoryFragment extends DialogFragment {
         final Context context = getActivity();
         final ContentResolver resolver = context.getContentResolver();
 
-        final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        // We need to specify android.R.style.Theme_DeviceDefault_Dialog explicitly,
+        // because the application theme 'DialogWhenReallyLarge' has
+        // fixed window size properties for large screen devices.
+        final AlertDialog.Builder builder = new AlertDialog.Builder(
+                context, AlertDialog.THEME_DEVICE_DEFAULT_LIGHT);
         final LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
 
         final View view = dialogInflater.inflate(R.layout.dialog_create_dir, null, false);
diff --git a/packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java b/packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java
index aad42ed9c9db2..1d021cb670b56 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/StandaloneActivity.java
@@ -80,15 +80,6 @@ public class StandaloneActivity extends BaseActivity {
 
         final Context context = this;
 
-        // Strongly define our horizontal dimension; we leave vertical as
-        final WindowManager.LayoutParams a = getWindow().getAttributes();
-
-        final Point size = new Point();
-        getWindowManager().getDefaultDisplay().getSize(size);
-        // a.width = (int) res.getFraction(R.dimen.dialog_width, size.x, size.x);
-
-        getWindow().setAttributes(a);
-
         mDirectoryContainer = (DirectoryContainerView) findViewById(R.id.container_directory);
 
         mState = (icicle != null)