Merge "Fix keyguard layout on tablet" into jb-mr1-dev

Author: Jim Miller

core/res/res/layout-sw600dp-land/keyguard_host_view.xml

@@ -26,7 +26,7 @@
     android:layout_height="match_parent"
     android:orientation="horizontal">
 
-    <com.android.internal.policy.impl.keyguard.KeyguardWidgetView
+    <com.android.internal.policy.impl.keyguard.KeyguardWidgetPager
         android:id="@+id/app_widget_container"
         android:layout_width="0dip"
         android:layout_height="match_parent"
@@ -36,7 +36,7 @@
         <!-- TODO: Remove this once supported as a widget -->
         <include layout="@layout/keyguard_status_view"/>
 
-    </com.android.internal.policy.impl.keyguard.KeyguardWidgetView>
+    </com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>
 
     <FrameLayout
         android:layout_width="0dip"

core/res/res/layout-sw600dp-port/keyguard_host_view.xml

@@ -28,7 +28,7 @@
     android:gravity="center_horizontal"
     android:clipChildren="false">
 
-    <com.android.internal.policy.impl.keyguard.KeyguardWidgetView
+    <com.android.internal.policy.impl.keyguard.KeyguardWidgetPager
         android:id="@+id/app_widget_container"
         android:layout_width="match_parent"
         android:layout_height="0dip"
@@ -38,7 +38,7 @@
         <!-- TODO: Remove this once supported as a widget -->
         <include layout="@layout/keyguard_status_view"/>
 
-    </com.android.internal.policy.impl.keyguard.KeyguardWidgetView>
+    </com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>
 
     <ViewFlipper
         android:id="@+id/view_flipper"