diff --git a/res/layout/font_size_preview.xml b/res/layout/font_size_preview.xml
index f4a861cf93d..d84bb39d611 100644
--- a/res/layout/font_size_preview.xml
+++ b/res/layout/font_size_preview.xml
@@ -14,35 +14,47 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="16dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    android:orientation="vertical">
+    android:fillViewport="true" >
 
-    <TextView
+    <view class="com.android.settings.TouchBlockingFrameLayout"
+        android:id="@+id/frame"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/font_size_preview_text_headline"
-        android:textAppearance="@android:style/TextAppearance.Material.Headline"/>
+        android:layout_height="wrap_content">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/font_size_preview_text_title"
-        android:textAppearance="@android:style/TextAppearance.Material.Title"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="16dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:orientation="vertical">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/font_size_preview_text_subtitle"
-        android:textAppearance="@android:style/TextAppearance.Material.Subhead"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/font_size_preview_text_headline"
+                android:textAppearance="@android:style/TextAppearance.Material.Headline"/>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/font_size_preview_text_body"
-        android:textAppearance="@android:style/TextAppearance.Material.Body1"/>
-</LinearLayout>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/font_size_preview_text_title"
+                android:textAppearance="@android:style/TextAppearance.Material.Title"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/font_size_preview_text_subtitle"
+                android:textAppearance="@android:style/TextAppearance.Material.Subhead"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/font_size_preview_text_body"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"/>
+        </LinearLayout>
+    </view>
+</ScrollView>
diff --git a/res/layout/preview_frame_container.xml b/res/layout/preview_frame_container.xml
deleted file mode 100644
index 5ba3b7fc467..00000000000
--- a/res/layout/preview_frame_container.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<view xmlns:android="http://schemas.android.com/apk/res/android"
-    class="com.android.settings.TouchBlockingFrameLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
diff --git a/res/layout/screen_zoom_preview_1.xml b/res/layout/screen_zoom_preview_1.xml
index 1acd677808d..42800916d89 100644
--- a/res/layout/screen_zoom_preview_1.xml
+++ b/res/layout/screen_zoom_preview_1.xml
@@ -13,56 +13,66 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/conversation_background"
-    android:paddingTop="@dimen/conversation_message_list_padding"
-    android:paddingStart="@dimen/conversation_message_list_padding"
-    android:paddingEnd="@dimen/conversation_message_list_padding"
-    android:orientation="vertical"
-    android:importantForAccessibility="noHideDescendants">
+    android:fillViewport="true" >
 
-    <com.android.settings.display.ConversationMessageView
+    <view class="com.android.settings.TouchBlockingFrameLayout"
+        android:id="@+id/frame"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:incoming="false"
-        app:messageText="@string/screen_zoom_conversation_message_1"
-        app:timestampText="@string/screen_zoom_conversation_timestamp_1"
-        app:iconText="@string/screen_zoom_conversation_icon_alex"
-        app:iconTextColor="@color/message_icon_text_outgoing"
-        app:iconBackgroundColor="@color/message_icon_background_outgoing" />
+        android:layout_height="wrap_content">
 
-    <com.android.settings.display.ConversationMessageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:incoming="true"
-        app:messageText="@string/screen_zoom_conversation_message_2"
-        app:timestampText="@string/screen_zoom_conversation_timestamp_2"
-        app:iconText="@string/screen_zoom_conversation_icon_pete"
-        app:iconTextColor="@color/message_icon_text_incoming"
-        app:iconBackgroundColor="@color/message_icon_background_incoming" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/conversation_background"
+            android:paddingTop="@dimen/conversation_message_list_padding"
+            android:paddingStart="@dimen/conversation_message_list_padding"
+            android:paddingEnd="@dimen/conversation_message_list_padding"
+            android:orientation="vertical"
+            android:importantForAccessibility="noHideDescendants">
 
-    <com.android.settings.display.ConversationMessageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:incoming="false"
-        app:messageText="@string/screen_zoom_conversation_message_3"
-        app:timestampText="@string/screen_zoom_conversation_timestamp_3"
-        app:iconText="@string/screen_zoom_conversation_icon_alex"
-        app:iconTextColor="@color/message_icon_text_outgoing"
-        app:iconBackgroundColor="@color/message_icon_background_outgoing" />
+            <com.android.settings.display.ConversationMessageView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:incoming="false"
+                app:messageText="@string/screen_zoom_conversation_message_1"
+                app:timestampText="@string/screen_zoom_conversation_timestamp_1"
+                app:iconText="@string/screen_zoom_conversation_icon_alex"
+                app:iconTextColor="@color/message_icon_text_outgoing"
+                app:iconBackgroundColor="@color/message_icon_background_outgoing" />
 
-    <com.android.settings.display.ConversationMessageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:incoming="true"
-        app:messageText="@string/screen_zoom_conversation_message_4"
-        app:timestampText="@string/screen_zoom_conversation_timestamp_4"
-        app:iconText="@string/screen_zoom_conversation_icon_pete"
-        app:iconTextColor="@color/message_icon_text_incoming"
-        app:iconBackgroundColor="@color/message_icon_background_incoming" />
+            <com.android.settings.display.ConversationMessageView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:incoming="true"
+                app:messageText="@string/screen_zoom_conversation_message_2"
+                app:timestampText="@string/screen_zoom_conversation_timestamp_2"
+                app:iconText="@string/screen_zoom_conversation_icon_pete"
+                app:iconTextColor="@color/message_icon_text_incoming"
+                app:iconBackgroundColor="@color/message_icon_background_incoming" />
 
-</LinearLayout>
+            <com.android.settings.display.ConversationMessageView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:incoming="false"
+                app:messageText="@string/screen_zoom_conversation_message_3"
+                app:timestampText="@string/screen_zoom_conversation_timestamp_3"
+                app:iconText="@string/screen_zoom_conversation_icon_alex"
+                app:iconTextColor="@color/message_icon_text_outgoing"
+                app:iconBackgroundColor="@color/message_icon_background_outgoing" />
+
+            <com.android.settings.display.ConversationMessageView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:incoming="true"
+                app:messageText="@string/screen_zoom_conversation_message_4"
+                app:timestampText="@string/screen_zoom_conversation_timestamp_4"
+                app:iconText="@string/screen_zoom_conversation_icon_pete"
+                app:iconTextColor="@color/message_icon_text_incoming"
+                app:iconBackgroundColor="@color/message_icon_background_incoming" />
+        </LinearLayout>
+    </view>
+</ScrollView>
diff --git a/res/layout/screen_zoom_preview_settings.xml b/res/layout/screen_zoom_preview_settings.xml
index 2e680090620..f93adc24a72 100644
--- a/res/layout/screen_zoom_preview_settings.xml
+++ b/res/layout/screen_zoom_preview_settings.xml
@@ -17,204 +17,210 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:scrollbars="none"
+    android:fillViewport="true"
     android:background="?android:attr/colorBackgroundFloating"
     android:importantForAccessibility="noHideDescendants">
 
-    <LinearLayout
+    <view class="com.android.settings.TouchBlockingFrameLayout"
+        android:id="@+id/frame"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="wrap_content">
 
-        <!-- Wifi Setting -->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:paddingStart="8dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:src="@drawable/wifi_signal_dark"
-                android:tint="?android:attr/colorAccent"
-                android:scaleType="center" />
+            android:orientation="vertical">
 
+            <!-- Wifi Setting -->
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingStart="16dp">
+                android:paddingTop="16dp"
+                android:paddingStart="8dp"
+                android:orientation="horizontal">
 
-                <TextView
-                    android:layout_width="wrap_content"
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:src="@drawable/wifi_signal_dark"
+                    android:tint="?android:attr/colorAccent"
+                    android:scaleType="center" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:text="@string/wifi_settings"
-                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-                    android:textColor="?android:attr/textColorPrimary" />
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:paddingStart="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/wifi_settings"
+                        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                        android:textColor="?android:attr/textColorPrimary" />
 
 
-                <TextView
-                    android:layout_width="wrap_content"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/wifi_display_status_not_available"
+                        android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                        android:textColor="?android:attr/textColorSecondary" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <!-- Data usage Setting -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingStart="8dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:src="@drawable/ic_settings_data_usage"
+                    android:tint="?android:attr/colorAccent"
+                    android:scaleType="center" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:text="@string/wifi_display_status_not_available"
-                    android:textAppearance="@android:style/TextAppearance.Material.Body1"
-                    android:textColor="?android:attr/textColorSecondary" />
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:paddingStart="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/data_usage_summary_title"
+                        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                        android:textColor="?android:attr/textColorPrimary" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/no_data_usage"
+                        android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                        android:textColor="?android:attr/textColorSecondary" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <!-- Display Setting -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingStart="8dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:src="@drawable/ic_settings_display"
+                    android:tint="?android:attr/colorAccent"
+                    android:scaleType="center" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:paddingStart="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/display_settings_title"
+                        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                        android:textColor="?android:attr/textColorPrimary" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/display_summary_on"
+                        android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                        android:textColor="?android:attr/textColorSecondary" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <!-- Sound & Notification Setting -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingStart="8dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:src="@drawable/ic_settings_sound"
+                    android:tint="?android:attr/colorAccent"
+                    android:scaleType="center" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:paddingStart="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/sound_settings"
+                        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                        android:textColor="?android:attr/textColorPrimary" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/sound_settings_example_summary"
+                        android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                        android:textColor="?android:attr/textColorSecondary" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <!-- Apps Setting -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingStart="8dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:src="@drawable/ic_settings_applications"
+                    android:tint="?android:attr/colorAccent"
+                    android:scaleType="center" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:paddingStart="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/applications_settings"
+                        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                        android:textColor="?android:attr/textColorPrimary" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/apps_summary_example"
+                        android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                        android:textColor="?android:attr/textColorSecondary" />
+                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-
-        <!-- Data usage Setting -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:paddingStart="8dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:src="@drawable/ic_settings_data_usage"
-                android:tint="?android:attr/colorAccent"
-                android:scaleType="center" />
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingStart="16dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/data_usage_summary_title"
-                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/no_data_usage"
-                    android:textAppearance="@android:style/TextAppearance.Material.Body1"
-                    android:textColor="?android:attr/textColorSecondary" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <!-- Display Setting -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:paddingStart="8dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:src="@drawable/ic_settings_display"
-                android:tint="?android:attr/colorAccent"
-                android:scaleType="center" />
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingStart="16dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/display_settings_title"
-                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/display_summary_on"
-                    android:textAppearance="@android:style/TextAppearance.Material.Body1"
-                    android:textColor="?android:attr/textColorSecondary" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <!-- Sound & Notification Setting -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:paddingStart="8dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:src="@drawable/ic_settings_sound"
-                android:tint="?android:attr/colorAccent"
-                android:scaleType="center" />
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingStart="16dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/sound_settings"
-                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/sound_settings_example_summary"
-                    android:textAppearance="@android:style/TextAppearance.Material.Body1"
-                    android:textColor="?android:attr/textColorSecondary" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <!-- Apps Setting -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:paddingStart="8dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:src="@drawable/ic_settings_applications"
-                android:tint="?android:attr/colorAccent"
-                android:scaleType="center" />
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingStart="16dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/applications_settings"
-                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/apps_summary_example"
-                    android:textAppearance="@android:style/TextAppearance.Material.Body1"
-                    android:textColor="?android:attr/textColorSecondary" />
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
+    </view>
 </ScrollView>
diff --git a/src/com/android/settings/PreviewPagerAdapter.java b/src/com/android/settings/PreviewPagerAdapter.java
index 8032f92002a..485ac8f7ada 100644
--- a/src/com/android/settings/PreviewPagerAdapter.java
+++ b/src/com/android/settings/PreviewPagerAdapter.java
@@ -25,6 +25,8 @@ import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
 
 /**
  * A PagerAdapter used by PreviewSeekBarPreferenceFragment that for showing multiple preview screen
@@ -32,7 +34,7 @@ import android.widget.FrameLayout;
  */
 public class PreviewPagerAdapter extends PagerAdapter {
 
-    private TouchBlockingFrameLayout[] mPreviewFrames;
+    private FrameLayout[] mPreviewFrames;
 
     /** Duration to use when cross-fading between previews. */
     private static final long CROSS_FADE_DURATION_MS = 400;
@@ -45,11 +47,13 @@ public class PreviewPagerAdapter extends PagerAdapter {
 
     public PreviewPagerAdapter(Context context, int[] previewSampleResIds,
                                Configuration[] configurations) {
-        mPreviewFrames = new TouchBlockingFrameLayout[previewSampleResIds.length];
+        mPreviewFrames = new FrameLayout[previewSampleResIds.length];
 
         for (int i = 0; i < previewSampleResIds.length; ++i) {
-            mPreviewFrames[i] = (TouchBlockingFrameLayout) LayoutInflater.from(context)
-                    .inflate(R.layout.preview_frame_container, null);
+            mPreviewFrames[i] = new FrameLayout(context);
+            mPreviewFrames[i].setLayoutParams(new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    LinearLayout.LayoutParams.MATCH_PARENT));
             mPreviewFrames[i].setContentDescription(
                     context.getString(R.string.preview_page_indicator_content_description, i + 1,
                             previewSampleResIds.length));
@@ -65,7 +69,6 @@ public class PreviewPagerAdapter extends PagerAdapter {
                         mPreviewFrames[i], false);
                 sampleView.setAlpha(0);
                 sampleView.setVisibility(View.INVISIBLE);
-
                 mPreviewFrames[i].addView(sampleView);
             }
         }