diff options
author | Daniel Sandler <dsandler@google.com> | 2009-11-05 13:54:10 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-05 13:54:10 -0800 |
commit | d4c615efc60013a75bb291658f40f1b9d24fdfa2 (patch) | |
tree | 7a0877a47d0cb39d4cabd5909c59d0684c19b22c /res | |
parent | 781ef4258c69c767e6ee49172ab0034310016009 (diff) | |
parent | 7e2a10d904ce52bde6e887b9c257709729f39613 (diff) | |
download | android_packages_wallpapers_LivePicker-d4c615efc60013a75bb291658f40f1b9d24fdfa2.tar.gz android_packages_wallpapers_LivePicker-d4c615efc60013a75bb291658f40f1b9d24fdfa2.tar.bz2 android_packages_wallpapers_LivePicker-d4c615efc60013a75bb291658f40f1b9d24fdfa2.zip |
am 7e2a10d9: Revised live wallpaper picker metadata display.
Merge commit '7e2a10d904ce52bde6e887b9c257709729f39613' into eclair-mr2
* commit '7e2a10d904ce52bde6e887b9c257709729f39613':
Revised live wallpaper picker metadata display.
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/live_wallpaper_content.xml | 41 | ||||
-rw-r--r-- | res/values/styles.xml | 20 |
2 files changed, 37 insertions, 24 deletions
diff --git a/res/layout/live_wallpaper_content.xml b/res/layout/live_wallpaper_content.xml index d9b3add..3809a35 100644 --- a/res/layout/live_wallpaper_content.xml +++ b/res/layout/live_wallpaper_content.xml @@ -20,6 +20,36 @@ android:layout_height="fill_parent" > + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dip" + android:layout_marginLeft="6dip" + > + <TextView android:id="@+id/title" + style="@style/WallpaperTitle" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + /> + <TextView android:id="@+id/author" + style="@style/WallpaperTitle" + android:layout_below="@id/title" + android:textSize="14dip" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dip" + /> + <TextView android:id="@+id/synopsis" + style="@style/WallpaperTitle" + android:layout_below="@id/author" + android:textSize="14dip" + android:ems="15" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="10dip" + /> + </RelativeLayout> + <FrameLayout android:layout_width="fill_parent" android:layout_height="0px" @@ -43,17 +73,6 @@ /> </FrameLayout> - <com.android.wallpaper.livepicker.BubbleTextView - style="@style/WorkspaceIcon" - android:id="@+id/title" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center" - android:visibility="gone" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_marginBottom="4dip" - /> - <Gallery android:id="@+id/gallery" android:gravity="fill" android:layout_width="fill_parent" diff --git a/res/values/styles.xml b/res/values/styles.xml index 6e67ae0..82b1707 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,19 +18,13 @@ --> <resources> - <style name="WorkspaceIcon"> - <item name="android:textSize">13dip</item> - <item name="android:singleLine">true</item> - <item name="android:ellipsize">marquee</item> + <style name="WallpaperTitle"> + <item name="android:textSize">20dip</item> <item name="android:shadowColor">#FF000000</item> - <item name="android:shadowRadius">2.0</item> - <item name="android:textColor">#FFF</item> - <item name="android:gravity">center_horizontal</item> - <item name="android:layout_width">fill_parent</item> - <item name="android:layout_height">fill_parent</item> - <item name="android:paddingTop">4dip</item> - <item name="android:paddingBottom">4dip</item> - <item name="android:paddingLeft">8dip</item> - <item name="android:paddingRight">8dip</item> + <item name="android:shadowRadius">2.5</item> + <item name="android:shadowDx">0</item> + <item name="android:shadowDy">0</item> + <item name="android:textColor">#FFFFFFFF</item> + <item name="android:gravity">left</item> </style> </resources> |