diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/live_wallpaper_base.xml | 20 | ||||
| -rw-r--r-- | res/layout/live_wallpaper_entry.xml | 4 | ||||
| -rw-r--r-- | res/layout/live_wallpaper_list.xml | 8 | ||||
| -rw-r--r-- | res/layout/live_wallpaper_preview.xml | 5 |
4 files changed, 28 insertions, 9 deletions
diff --git a/res/layout/live_wallpaper_base.xml b/res/layout/live_wallpaper_base.xml new file mode 100644 index 0000000..6803901 --- /dev/null +++ b/res/layout/live_wallpaper_base.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/live_wallpaper_base_view" + android:layout_width="match_parent" + android:layout_height="match_parent"/> diff --git a/res/layout/live_wallpaper_entry.xml b/res/layout/live_wallpaper_entry.xml index cce484f..b39cefb 100644 --- a/res/layout/live_wallpaper_entry.xml +++ b/res/layout/live_wallpaper_entry.xml @@ -29,7 +29,7 @@ android:id="@+id/thumbnail" android:layout_width="@dimen/live_wallpaper_thumbnail_width" - android:layout_height="@dimen/live_wallpaper_thumbnail_width" + android:layout_height="@dimen/live_wallpaper_thumbnail_height" android:layout_gravity="center_vertical" @@ -47,7 +47,7 @@ android:orientation="vertical"> <TextView - android:id="@+id/title_author" + android:id="@+id/title" android:layout_width="match_parent" android:layout_height="wrap_content" 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 diff --git a/res/layout/live_wallpaper_preview.xml b/res/layout/live_wallpaper_preview.xml index d5da853..38cc2ac 100644 --- a/res/layout/live_wallpaper_preview.xml +++ b/res/layout/live_wallpaper_preview.xml @@ -23,7 +23,7 @@ android:paddingBottom="4dip"> <Button - android:layout_width="160dip" + android:layout_width="@dimen/live_wallpaper_preview_button_width" android:layout_height="wrap_content" android:layout_gravity="center_vertical" @@ -34,12 +34,11 @@ <Button android:id="@+id/configure" - android:layout_width="160dip" + android:layout_width="@dimen/live_wallpaper_preview_button_width" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="@string/configure_wallpaper" android:onClick="configureLiveWallpaper" /> - </LinearLayout> |