diff --git a/packages/DocumentsUI/res/layout-sw720dp/activity.xml b/packages/DocumentsUI/res/layout-sw720dp/activity.xml
deleted file mode 100644
index 97f763395e6c5..0000000000000
--- a/packages/DocumentsUI/res/layout-sw720dp/activity.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ViewStub xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/stub"
-    android:inflatedId="@+id/drawer_layout"
-    android:layout="@layout/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
diff --git a/packages/DocumentsUI/res/layout/activity.xml b/packages/DocumentsUI/res/layout/activity.xml
deleted file mode 100644
index 97f763395e6c5..0000000000000
--- a/packages/DocumentsUI/res/layout/activity.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ViewStub xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/stub"
-    android:inflatedId="@+id/drawer_layout"
-    android:layout="@layout/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
diff --git a/packages/DocumentsUI/res/layout-sw720dp-land/files_activity.xml b/packages/DocumentsUI/res/values-sw720dp-land/layouts.xml
similarity index 71%
rename from packages/DocumentsUI/res/layout-sw720dp-land/files_activity.xml
rename to packages/DocumentsUI/res/values-sw720dp-land/layouts.xml
index 474b54699a905..0e1807ce165b9 100644
--- a/packages/DocumentsUI/res/layout-sw720dp-land/files_activity.xml
+++ b/packages/DocumentsUI/res/values-sw720dp-land/layouts.xml
@@ -14,9 +14,6 @@
      limitations under the License.
 -->
 
-<ViewStub xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/stub"
-    android:inflatedId="@+id/fixed_layout"
-    android:layout="@layout/fixed_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+<resources>
+    <item name="files_activity" type="layout">@layout/fixed_layout</item>
+</resources>
diff --git a/packages/DocumentsUI/res/layout/files_activity.xml b/packages/DocumentsUI/res/values-sw720dp/layouts.xml
similarity index 71%
rename from packages/DocumentsUI/res/layout/files_activity.xml
rename to packages/DocumentsUI/res/values-sw720dp/layouts.xml
index cb70543fb9c1c..7d28f9cbc2ac1 100644
--- a/packages/DocumentsUI/res/layout/files_activity.xml
+++ b/packages/DocumentsUI/res/values-sw720dp/layouts.xml
@@ -14,9 +14,6 @@
      limitations under the License.
 -->
 
-<ViewStub xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/stub"
-    android:inflatedId="@+id/drawer_layout"
-    android:layout="@layout/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+<resources>
+    <item name="docs_activity" type="layout">@layout/fixed_layout</item>
+</resources>
diff --git a/packages/DocumentsUI/res/layout-sw720dp/files_activity.xml b/packages/DocumentsUI/res/values/layouts.xml
similarity index 71%
rename from packages/DocumentsUI/res/layout-sw720dp/files_activity.xml
rename to packages/DocumentsUI/res/values/layouts.xml
index cb70543fb9c1c..c73a1cbf2538b 100644
--- a/packages/DocumentsUI/res/layout-sw720dp/files_activity.xml
+++ b/packages/DocumentsUI/res/values/layouts.xml
@@ -14,9 +14,7 @@
      limitations under the License.
 -->
 
-<ViewStub xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/stub"
-    android:inflatedId="@+id/drawer_layout"
-    android:layout="@layout/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+<resources>
+    <item name="docs_activity" type="layout">@layout/drawer_layout</item>
+    <item name="files_activity" type="layout">@layout/drawer_layout</item>
+</resources>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index 7b50b62694130..2835106b9a879 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -108,9 +108,7 @@ abstract class BaseActivity extends Activity {
                 ? icicle.<State>getParcelable(EXTRA_STATE)
                         : buildDefaultState();
 
-        setContentView(R.layout.files_activity);
-        ViewStub stub = (ViewStub) findViewById(R.id.stub);
-        stub.inflate();
+        setContentView(mLayoutId);
 
         mRoots = DocumentsApplication.getRootsCache(this);
         mSearchManager = new SearchManager();
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
index 6d85dec1c4dd2..fdc4bb06ffff2 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
@@ -82,7 +82,7 @@ public class DocumentsActivity extends BaseActivity {
     private BaseAdapter mStackAdapter;
 
     public DocumentsActivity() {
-        super(R.layout.activity, TAG);
+        super(R.layout.docs_activity, TAG);
     }
 
     @Override