summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jim Miller <jaggies@google.com> 2012-08-30 10:31:41 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-08-30 10:31:42 -0700
commit08db9df1af78dbe26af89f57c5e2777e1142b566 (patch)
tree65fd17ebf134a22ec4c5ca0911e78f43ffe88ba1
parent451da77972a4eead1317929e3176a9aa2a2707e9 (diff)
parent07cb030c4ef8a822cb249a3ca2cc429c6bb0497e (diff)
Merge "Fix keyguard layout on tablet" into jb-mr1-dev
-rw-r--r--core/res/res/layout-sw600dp-land/keyguard_host_view.xml4
-rw-r--r--core/res/res/layout-sw600dp-port/keyguard_host_view.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/core/res/res/layout-sw600dp-land/keyguard_host_view.xml b/core/res/res/layout-sw600dp-land/keyguard_host_view.xml
index c552885a4171..e77f5843ac56 100644
--- a/core/res/res/layout-sw600dp-land/keyguard_host_view.xml
+++ b/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"
diff --git a/core/res/res/layout-sw600dp-port/keyguard_host_view.xml b/core/res/res/layout-sw600dp-port/keyguard_host_view.xml
index 675b69b9ca3b..50636f1f2b8c 100644
--- a/core/res/res/layout-sw600dp-port/keyguard_host_view.xml
+++ b/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"