summaryrefslogtreecommitdiffstats
path: root/res/layout/live_wallpaper_list.xml
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2010-12-03 18:16:06 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-03 18:16:06 -0800
commit0ab0466df1edeb03700069a9989bf1ee30ce8fdf (patch)
treeeb0efd7f18eb37d6b01eb57b5e3f5d10bfce752c /res/layout/live_wallpaper_list.xml
parent61b18eb2569e3d2cec85a414f83d036c17e9029f (diff)
parent494767f1f8a29d2197837463fb6477646e682478 (diff)
downloadandroid_packages_wallpapers_LivePicker-0ab0466df1edeb03700069a9989bf1ee30ce8fdf.tar.gz
android_packages_wallpapers_LivePicker-0ab0466df1edeb03700069a9989bf1ee30ce8fdf.tar.bz2
android_packages_wallpapers_LivePicker-0ab0466df1edeb03700069a9989bf1ee30ce8fdf.zip
Merge "Updated the LivePicker for tablet UI"
Diffstat (limited to 'res/layout/live_wallpaper_list.xml')
-rw-r--r--res/layout/live_wallpaper_list.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/res/layout/live_wallpaper_list.xml b/res/layout/live_wallpaper_list.xml
index 9ac8c66..a3c22bb 100644
--- a/res/layout/live_wallpaper_list.xml
+++ b/res/layout/live_wallpaper_list.xml
@@ -14,8 +14,9 @@
limitations under the License.
-->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<ListView
android:id="@android:id/list"
@@ -34,5 +35,4 @@
android:text="@string/live_wallpaper_empty"
android:textAppearance="?android:attr/textAppearanceMedium" />
-
-</merge> \ No newline at end of file
+</FrameLayout> \ No newline at end of file